Merge branch 'develop'
Version bump + dch, declared for stable
Bugfixing in debian/control
Bugfix in debian/rules for Debian Squeeze
Merge branch 'master' into develop