merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 16 Dec 2010 22:27:56 +0000 (23:27 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 16 Dec 2010 22:27:56 +0000 (23:27 +0100)

Trivial merge