From: Marco Yuen <marcoy@gmail.com>
Date: Wed, 21 Dec 2011 16:22:40 +0000 (-0500)
Subject: Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/build into lxc_devel
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b1ce28eb44ef509cb65cceae57c234a4cbe97d8e;hp=-c;p=build.git

Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/build into lxc_devel
---

b1ce28eb44ef509cb65cceae57c234a4cbe97d8e
diff --combined config.planetlab/bootstrapfs.pkgs
index c6021e31,5cb8437b..b7e21e26
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@@ -12,7 -12,6 +12,7 @@@ package: bridge-util
  package: dnsmasq
  package: bash-completion
  package: kernel
 +package: kernel-firmware
  package: udev
  package: basesystem
  package: filesystem
@@@ -105,7 -104,7 +105,7 @@@ package>=f10: croni
  #
  # planetlab
  #
- package: madwifi
+ #package: madwifi
  package: wireless-tools
  #package: util-vserver
  #package: util-vserver-build