Branches for Natty

Author: Artem Popov
Revision Date: 2011-02-10 19:58:27 UTC

* Merge from debian unstable (LP: #716443). Remaining changes:
  - Fix umask permitions (LP: #611950)
    + debian/patches/fix_umask_permitions.patch
  - Disable compiler optimization for thumb2/armv7. (LP: #600717)
  - debian/patches/pot_desktop_msgid.patch: Add .desktop file Name and
    Comment to the POT.
  - debian/control:
    + Depend on firefox instead of iceweasel.
  - debian/xsane.desktop:
    + Use generic scanner icon instead of out-dated/confusing xsane icon
    + Modified to match POT changes (LP: #410234)