merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 30 Apr 2009 16:44:47 +0000 (18:44 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 30 Apr 2009 16:44:47 +0000 (18:44 +0200)

Trivial merge