Imported Upstream version 0.006
Merge tag 'upstream/0.006' into ubuntu-lucid

Upstream version 0.006
updated changelog