merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 15 Jul 2010 19:29:23 +0000 (21:29 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 15 Jul 2010 19:29:23 +0000 (21:29 +0200)

Trivial merge