merge
authorStefan Behnel <scoder@users.berlios.de>
Sun, 31 Oct 2010 18:27:45 +0000 (19:27 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sun, 31 Oct 2010 18:27:45 +0000 (19:27 +0100)

Trivial merge