libofa: pull debian patches to fix build with new gcc
gcj: add 47 and 48, make 47 default

gcj48 doesn't build yet
openjdk: Don't statically link C++ runtime, close #730.

This fixes a build error (https://github.com/NixOS/nixpkgs/issues/707).
Thanks to
http://mail.openjdk.java.net/pipermail/build-dev/2012-January/005349.html
Merge master into stdenv-updates

Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
qca2: Patch for gcc 4.7+ (close #738).

Thanks to
http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html
add "quilt" (patch manager)
kernel/generic: pass through prePatch as well
new package: "linux-lts-3.0"

Long term support kernels:
http://ltsi.linuxfoundation.org/what-is-ltsi
new package: "linux-lts-3.4"

Long term support kernels:
http://ltsi.linuxfoundation.org/blog/2013-01-22/ltsi-v3.4-released
default kernel: upgrade to 3.4 lts
linux headers 3.4 lts - needs refactoring
switch to 3.4lts headers
glibc: make minimum supported kernel version configurable

The minimum we support is 3.2.43 which is nixos' default kernel in
master. On every stdenv-updates merge, we will move this number up to
the previous latest default kernel.

for people who want older kernels, a "compat" setting (headers +
glibc) will soon appear
Merge branch 'master' into stdenv-rebase
Revert "e2fsprogs: Fix manpages", no more need for this

This reverts commit 7f4e47383281875c9712e94666917a22ca63e897.
See #523 and #529.
strigi: patch to compile on stdenv-updates (close #755)

This patch exports a class with STRIGI_EXPORT that wasn't exported
before.
Merge remote-tracking branch 'official/stdenv-updates' into stdenv-updates
Merge branch 'master' into stdenv-updates

Conflicts:
	pkgs/top-level/all-packages.nix
Merge branch 'master' into stdenv-updates

Conflicts:
	pkgs/top-level/all-packages.nix
Merge branch 'master' into stdenv-updates