Branches for Edgy

Author: Daniel T Chen
Revision Date: 2006-08-17 00:34:10 UTC

* Merge from Debian unstable. The following Ubuntu changes remain:
  - Only ship modprobe configuration,
  - Remove default mode,
  - Invoke modprobe with -Qb and command line options,
  - Remove modprobe post-install script in favour of using udev,
  - Merge Debian 1.0.11-5's apm script into the initscript, and
    continue to ship the initscript in the apm scripts dir,
  - Don't allow snd-usb-audio to grab the default index, 0
    (Closes Ubuntu: #31109, #46996, #46998).