merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 24 Apr 2009 17:45:05 +0000 (19:45 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 24 Apr 2009 17:45:05 +0000 (19:45 +0200)

Trivial merge