merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 20 Apr 2011 15:54:39 +0000 (17:54 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 20 Apr 2011 15:54:39 +0000 (17:54 +0200)

Trivial merge