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

Upstream version 0.022
Updated changelog for 0.022-1.