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

Upstream version 0.025
Updated changelog for 0.025-1.