merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 8 Apr 2009 04:38:56 +0000 (06:38 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 8 Apr 2009 04:38:56 +0000 (06:38 +0200)

Trivial merge