Recommitting the part of r2299 that was lost in the latest merge. This fixes #680. Please see ticket for details. Thanks fesja for reporting.
Recommitting the part of r2299 that was lost in the latest merge. This fixes #680. Please see ticket for details. Thanks fesja for reporting.

git-svn-id: d0e296eae3c99886147898d36662a67893ae90b2@2623 653ae4dd-d31e-0410-96ef-6bf7bf53c507

dragonmantank/Habari,dragonmantank/Habari,dragonmantank/Habari