merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 1 Dec 2010 10:40:37 +0000 (11:40 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 1 Dec 2010 10:40:37 +0000 (11:40 +0100)

Trivial merge