merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 29 Apr 2009 19:54:06 +0000 (21:54 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 29 Apr 2009 19:54:06 +0000 (21:54 +0200)

Trivial merge