Branches for Quantal

Author: James Page
Revision Date: 2012-09-24 10:43:19 UTC

* Merge from Debian unstable. Remaining changes:
  - This package is x86/arm only. Update control to match.
  - d/patches/2020_increase_test_timeout.patch: Increased default test
    timeout from 60 to 120 seconds to support reliable execution of all
    tests on armhf/armel architectures.
  - d/patches/2005_expected_failing_tests.patch:
    - Allow racey tests to fail: test-child-process-fork2.
    - Allow test-fs-watch to fail as LP buildd's don't support
      inotify.