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

Upstream version 0.007
Updated changelog for 0.007-1.