merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 9 Dec 2009 09:34:31 +0000 (10:34 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 9 Dec 2009 09:34:31 +0000 (10:34 +0100)

Trivial merge