merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 17 Jul 2010 05:29:20 +0000 (07:29 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 17 Jul 2010 05:29:20 +0000 (07:29 +0200)

Trivial merge