Imported Upstream version 0.4
Merge tag 'upstream/0.4' into debian/wheezy
debian release 0.4-1+wheezy1