merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 13 Mar 2010 06:18:26 +0000 (07:18 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 13 Mar 2010 06:18:26 +0000 (07:18 +0100)

Trivial merge