Merge branch 'master' into core-updates

diff --cc gnu-system.am
Simple merge

diff --cc gnu/packages/base.scm
index 89d90c9,906d0a3..1f6e863
--- 1/gnu/packages/base.scm
--- 2/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -1,6 -1,7 +1,7 @@@
  ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
+ ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/xorg.scm
Simple merge