merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 9 Oct 2009 14:44:30 +0000 (16:44 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 9 Oct 2009 14:44:30 +0000 (16:44 +0200)

Trivial merge