svn merge ^/nixpkgs/trunk

A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434

pkgs/misc/drivers/hplip/default.nix

@@ -1,5 +1,5 @@
 {stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus
-, pkgconfig, polkit, qtSupport ? false, qt4
+, pkgconfig, polkit, qtSupport ? true, qt4
 }:
 
 stdenv.mkDerivation rec {

pkgs/misc/uboot/nanonote.nix

@@ -26,6 +26,8 @@ stdenv.mkDerivation {
     done
     chmod +w -R *
     sed -i -e 's/console=ttyS0,57600n8//' include/configs/qi_lb60.h
+    # Load more than 2MiB for the kernel
+    sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h
   '';
 
   # Remove the cross compiler prefix, and add reiserfs support