merged in Vitek's fix for ticket 668
authorStefan Behnel <scoder@users.berlios.de>
Fri, 1 Apr 2011 14:32:49 +0000 (16:32 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 1 Apr 2011 14:32:49 +0000 (16:32 +0200)

Trivial merge