merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 20 Nov 2010 19:55:44 +0000 (20:55 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 20 Nov 2010 19:55:44 +0000 (20:55 +0100)

Trivial merge