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

diff --combined config.planetlab/bootstrapfs.pkgs
index c6021e3,5cb8437..b7e21e2
--- 1/config.planetlab/bootstrapfs.pkgs
--- 2/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