merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 28 Apr 2011 20:48:48 +0000 (22:48 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 28 Apr 2011 20:48:48 +0000 (22:48 +0200)

Trivial merge