Merge lp://qastaging/~debfx/firefox/firefox-4.0-kde into lp://qastaging/firefox/trunk

* Bump minimum NSS / NSPR version
  - update debian/rules
* Fix the profile migrator to not hang when ~/.mozilla doesn't exist, and
  other improvements- update debian/migrator/xulapp-profilemigrator
  - update debian/migrator/xulapp-profilemigrator
* Build with --enable-startup-notification again, this got dropped
  in the 3.6 => 4.0 update
  - update debian/mozconfig.in
* Ship the testpilot extension for beta as per the official builds, based
  on the discussion on #developers. We achieve this by building with
  --enable-update-channel=beta for the beta milestones only. The update
  channel isn't used anywhere at runtime because we disable the updater.
  This means that Ubuntu users can participate in testpilot user studies
  in Natty
  - update debian/rules
  - update debian/firefox-core.install.in
  - update debian/mozconfig.in
* Add a hack to the launcher to handle being launched from an alternative,
  which is a symlink to the launcher script, and breaks the current launch
  mechanism. Also remove a useless stat() from the current script
  - update debian/firefox.sh.in
* Re-add patch that got dropped to not remove and re-add search plugins
  during upgrade
  - add debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch
  - update debian/patches/series

Really add patch this time

pull in natty apparmor changes

* Move libmozgnome.so to the main package in common-binary-predeb-arch.
  The previous method of deleting it from -gnome-support and copying it to
  the main package from debian/tmp in each of the binary-predeb targets
  meant that we were shipping an unstripped copy, which caused a lintian
  error. This new method ensures we retain the stripped SO and we still
  only move it after dh_shlibdeps has run
  - update debian/rules

* Refresh patches

update AppArmor profiles to what is in firefox-4.0

* Change xubuntu applications defaults list in natty apparmor profile; Path
  changed in xubuntu-default-settings (11.04.0)
  - update usr.bin.firefox.apparmor.11.04

debian/usr.bin.firefox.apparmor.11.04: remove redundant abstractions

* Merge from lp:~debfx/firefox/firefox-4.0-kde