Merge tag 'upstream/1.1_hg20130427' into debian-sid

Upstream version 1.1~hg20130427
bump version
Merge tag 'upstream/1.1' into debian-sid

Upstream version 1.1
New upstream version 1.1