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

Trivial merge