merge
authorStefan Behnel <scoder@users.berlios.de>
Sun, 28 Mar 2010 12:58:40 +0000 (14:58 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Sun, 28 Mar 2010 12:58:40 +0000 (14:58 +0200)

Trivial merge