merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 23 Jul 2010 14:57:35 +0000 (16:57 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 23 Jul 2010 14:57:35 +0000 (16:57 +0200)

Trivial merge