Imported Upstream version 0.036

Change-Id: Ia85b706cee5c8495cf960de7aa6ba9c9e6c2e86a
Merge tag 'upstream/0.036' into ubuntu-lucid

Upstream version 0.036
Updated changelog for 0.036-1.

Change-Id: I9cc6f22a2413c962035889d7600e3e73e9788297