fix pangomm build: use cairo 1.12.2
fixed a patch which was rejected, i wonder why it was still there...
Merge branch 'master' of github.com:NixOS/nixpkgs
linux: Update to 3.2.50
grc: add expression
password-store: add expression
linux: properly parse config choice when it's new
linux: update grsecurity patch
dunst: upgrade to git version to fix 100% CPU problems
Merge pull request #805 from lovek323/pass

password-store: add expression
Merge pull request #793 from lovek323/grcat

grc: add expression
Merge pull request #806 from lovek323/pangomm

fix pangomm build: use cairo 1.12.2
upower: 0.9.19 -> 0.9.21
VM builds: Use Linux 3.10

3.4 apparently gives corrupt 9pfs data on x86.  See e.g.

  http://hydra.nixos.org/build/5661036

where reading /nix/store/kfldnrrsq0lbbv13gjxdfb3vb1sbaz88-vm-run-stage2
gives garbage.  Strangely it doesn't happen here:

  http://hydra.nixos.org/build/5658978

Ah well.
supervisor: 3.0b2 -> 3.0
man-pages: Update to 3.53
nss: Update to 3.15.1
subversion: Update to 1.7.11

CVE-2013-4131
firefox: Update to 23.0
flashplayer: Update to 11.2.202.297