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

Upstream version 0.031
Updated changelog for 0.031-1.