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

Upstream version 0.021
Updated changelog for 0.021-1.