merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 15 Apr 2010 21:18:28 +0000 (23:18 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 15 Apr 2010 21:18:28 +0000 (23:18 +0200)

Trivial merge