merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 26 Nov 2010 16:01:43 +0000 (17:01 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 26 Nov 2010 16:01:43 +0000 (17:01 +0100)

Trivial merge