merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 9 Apr 2010 05:13:57 +0000 (07:13 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 9 Apr 2010 05:13:57 +0000 (07:13 +0200)

Trivial merge