* Merge from Debian unstable. Remaining changes: - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be built, as this is required by some applications (LP: #632984) - debian/control: - Build-dep on libxt-dev, libgstreamer-plugins-base0.10-dev, and libgconf2-dev for mediactrl. - Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion to guarantee upgrade ordering when moving from pycentral to dh_python2. - Patches + fix-bashism-in-example.patch * Backport patch to fix calling SetMenuBar() twice causes the menubar to not resize correctly in GTK. (LP: #996407)