Fix for 2316 in bugzilla

[Martin Vermeer]

Tested and working. Not quite as trivial as 2316 though, so someone have
a look at it.

- Martin

pgp4zsnDnbVkc.pgp
Description: PGP signature