merge
authorStefan Behnel <scoder@users.berlios.de>
Sun, 16 May 2010 08:10:06 +0000 (10:10 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Sun, 16 May 2010 08:10:06 +0000 (10:10 +0200)

Trivial merge