merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 18 Apr 2009 19:49:28 +0000 (21:49 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 18 Apr 2009 19:49:28 +0000 (21:49 +0200)

Trivial merge