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

Upstream version 0.035
Updated changelog for 0.035-1.