Navigation

This is a bugfix release. One regression introduced in 2.2b1 has been fixed
for some rare conflict resolutions. Also a warning is now emmitted when
branching an out-of-date ubuntu packaging branch. Upgrading is recommended
for all users on earlier 2.2 releases.