merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 17 Feb 2010 20:59:28 +0000 (21:59 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 17 Feb 2010 20:59:28 +0000 (21:59 +0100)

Trivial merge