merge
authorStefan Behnel <scoder@users.berlios.de>
Mon, 13 Dec 2010 13:35:29 +0000 (14:35 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Mon, 13 Dec 2010 13:35:29 +0000 (14:35 +0100)

Trivial merge