merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 26 Jan 2011 20:46:35 +0000 (21:46 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 26 Jan 2011 20:46:35 +0000 (21:46 +0100)

Trivial merge