add bash-4.2 patches 25 through 39
Merge remote-tracking branch 'upstream/master' into bash.121120
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Applied to wrong branch.
Revert "add bash-4.2 patches 25 through 39"

This reverts commit b6c5b9806f6ae79652336a7cfb51fe0f03d0590a.
Merge https://github.com/jcumming/nixpkgs into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
Upgrade VirtualBox Guest Additions to 4.2.6
Add preInstall ot buildPythonPackage (postInstall already existed) to allow selenium to work properly again.
haskell-nat: add version 0.3
haskell-naturals: add version 0.2.0.2
haskell-xmonad-extras: update to version 0.11
haskell-active: update to version 0.1.0.3
haskell-diagrams-core: update to version 0.6.0.1
haskell-diagrams-lib: update to version 0.6.0.1
haskell-dual-tree: update to version 0.1.0.1
haskell-lens: update to version 3.7.3
haskell-monoid-extras: update to version 0.2.2.2
haskell-multiarg: update to version 0.8.0.0
haskell-warp: update to version 1.3.7