merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 10 Apr 2009 05:50:09 +0000 (07:50 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 10 Apr 2009 05:50:09 +0000 (07:50 +0200)

Trivial merge