Squashed commit of the following:

commit e110d0fca3b8b83cacdfb8a4991eccdd310365b6
Merge: 2a3731a a211ed5
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Sun Jun 30 16:36:11 2013 +0200

    Merge branch 'emacs-package-el' into emacs-packages-updates

commit 2a3731a5156153186dbf994b87c89e5fc9f3e608
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Sun Jun 30 13:56:34 2013 +0200

    Update emacs-packages-generated.nix.

commit d4306b495c1706c5590c94670a995ce0e61cfd20
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Sat Jun 29 01:09:59 2013 +0200

    Update emacs-packages-generated.nix.

commit 59c5e5055f401f867e3b79ff398572f64cb84823
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Fri Jun 28 15:23:40 2013 +0200

    Update emacs-packages-generated.nix.

commit cf3065dd11523289765fd8d11327f546585974e7
Merge: b2831aa ae3d3e8
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Fri Jun 28 15:12:39 2013 +0200

    Merge remote-tracking branch 'origin/emacs-package-el' into emacs-packages-updates

commit b2831aa1c017bbf82039e8ef5b1fea5765bc65b1
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Fri Jun 28 00:42:58 2013 +0200

    Update emacs-packages-generated.nix.

    Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

commit ea4e897f0d78321c447203062a33758291fd51e7
Merge: 5d368b1 c7a5e97
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Fri Jun 28 00:41:32 2013 +0200

    Merge branch 'emacs-package-el' into emacs-packages-updates

    Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

commit 5d368b1875790839a5017acf5be329acfd70a076
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Fri Jun 28 00:08:19 2013 +0200

    Add `package--builtins' to `nix-emacs-included-packages'.

    Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

commit a517e220dbb4c36e2418d1622e1bd8de9fdaa1f5
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Wed Jun 26 15:16:32 2013 +0200

    Remove tarball target.

    Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

commit d74e18bbe5a758a12fd4fa389e2761f6ec9404fc
Author: Moritz Ulrich <moritz@tarn-vedra.de>
Date:   Wed Jun 26 15:01:34 2013 +0200

    Update emacs-packages-generated.nix.

    Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>