merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 30 Dec 2010 00:23:00 +0000 (01:23 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 30 Dec 2010 00:23:00 +0000 (01:23 +0100)

Trivial merge