merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 30 Apr 2009 15:15:58 +0000 (17:15 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 30 Apr 2009 15:15:58 +0000 (17:15 +0200)

Trivial merge