merge
authorStefan Behnel <scoder@users.berlios.de>
Sun, 25 Apr 2010 19:55:39 +0000 (21:55 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Sun, 25 Apr 2010 19:55:39 +0000 (21:55 +0200)

Trivial merge