-
Committer:
Bazaar Package Importer
-
Author(s):
David Futcher
-
Date:
2009-04-30 07:46:11 UTC
-
mfrom:
(1.1.11 upstream)
(4.1.7 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090430074611-6dih80a5mk2uvxhk
Tags: 2.3.7+20090416-1ubuntu1
* Merge from debian unstable (LP: #370427), remaining changes:
  - debian/patches/12_no-ssp.patch: Build bios with -fno-stack-protector
  - Add Replaces/Conflicts for bochsbios-qemu (<< 2.3.6-2)