merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 16 Oct 2009 11:51:20 +0000 (13:51 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 16 Oct 2009 11:51:20 +0000 (13:51 +0200)

Trivial merge