Update ocaml-pcre to version 7.1.1
Fix x11 include and lib parameters for configure script.
Make x11 optionnal for ocaml
Merge recent master into x-updates

Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
e18.enlightenment: fix build by adding bzip2

I'm lazy to find how exatly the need propagated in x-updates.
updating bitcoin to 0.9.2.1
fixing whitespace
mesos: Add package

Apache Mesos is a cluster manager that simplifies the complexity of running
applications on a shared pool of servers.
go: Fix build

http://hydra.nixos.org/build/12538479
Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/misc/vim-plugins/default.nix
Don't use ensureDir
readline-6.3: Fix build on Mac OS X < 10.9

http://hydra.nixos.org/build/12476331
gstreamer: update to 1.4.0
gst-plugins-base: update to 1.4.0
gst-plugins-good: update to 1.4.0
gst-plugins-bad: update to 1.4.0
gst-plugins-ugly: update to 1.4.0
gst-libav: update to 1.4.0
opencv: Enable fewer dependencies by default

In particular, this prevents KDE from pulling in gfortran, numpy and
atlas. We don't want anything important depending on atlas because it
has a crazy non-deterministic build system.

http://hydra.nixos.org/build/12555947
gcc: Fix multilib builds

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