Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-file' into experimental/multiple-versions-in-one-file

* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (203 commits)
  Fix KDE 4.8 and 4.7 build against new SIP
  KDE4.10 dolphin-plugins-*: fix the build.
  KDE4.10 kioslave-{svn,perldoc}: Fix build.
  KDE4.10: Kate: Add experimental python support.
  KDE4.10 print-manager: Fix build.
  KDE4.10: Fix PyKDE4 build I accidentally left in a broken state. Remove notice from kajongg because it compiles fine now.
  PyQt4: Advance version to 4.10.1. Note: needed for KDE4.10 to build.
  python sip: Advance to version 4.14.6. Note: Needed for KDE4.10 to build.
  KDE 4.10: kdesdk-thumbnailers: Patch the build system to fix build failure.
  KRDC: it builds now, so remove the notice
  libvncserver: Advance to version 0.9.9. Note: Fixes KDE4.10 build.
  KStars: forgot to remove the notice that it doesn't build.
  indilib: Advance to version 0.9.6. Note: this fixes the build of kstars from KDE4.10.
  spyder: create desktop menu item
  spyder: add recommended and optional dependencies
  nodePackages.underscore: Update
  Add extend nodePackage
  Add express nodePackage
  php-5.4: Don't build gd as a dynamically-loaded extension
  byobu 5.37 integration
  ...
Merge remote-tracking branch 'refs/remotes/gh/experimental/multiple-versions-in-one-file' into HEAD

* refs/remotes/gh/experimental/multiple-versions-in-one-file:
  improve documentation
  set name by default
  comments
  documentation
  new tg branch experimental/multiple-versions-in-one-file

Conflicts:
	pkgs/lib/misc.nix
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/php

* experimental/multiple-versions-in-one-file:
Merge remote-tracking branch 'refs/remotes/gh/experimental/php' into HEAD

* refs/remotes/gh/experimental/php: (41 commits)
  forgott to change hash
  follow upstream gd change
  improve documentation
  fix
  add upstream changes, put options in order of master
  hash patch was merged upstream (hash -> hashString)
  follow upstream etc change
  updates, todo
  patch
  fix php-fpm-5.2 startup
  socket & service
  update php 5.2 for testing
  resurrect php 5.2. Need to run old code
  php 5.2 no parallel
  don't depend on syslog.target, stop tracing
  privatetmp
  nicer shorter php id only based on config, update php-fpm-5.3 to make it work with systemd
  start rewriting jobs as systemd
  php fpm daemons: allow setting PHPRC to php ini file so that xdebug works
  typo2
  ...
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/nodejs

* experimental/multiple-versions-in-one-file:
Merge remote-tracking branch 'refs/remotes/gh/experimental/nodejs' into HEAD

* refs/remotes/gh/experimental/nodejs:
  fix
  adding newer nodejs version also making it the default
  new tg branch experimental/nodejs
Merge branch 'experimental/nodejs' into refs/top-bases/experimental/marc

* experimental/nodejs:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/mingw

* experimental/multiple-versions-in-one-file:
Merge remote-tracking branch 'refs/remotes/gh/experimental/mingw' into HEAD

* refs/remotes/gh/experimental/mingw:
  New TopGit dependency: experimental/multiple-versions-in-one-file
  can be null
  fix mingw cross builds by using older compiler.
  openssl: fix mingw cross build by disabling patch
  make curl and mingw work
  new tg branch experimental/mingw
Merge branch 'experimental/mingw' into refs/top-bases/experimental/marc

* experimental/mingw:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/haxe

* experimental/multiple-versions-in-one-file:
Merge remote-tracking branch 'refs/remotes/gh/experimental/haxe' into HEAD

* refs/remotes/gh/experimental/haxe:
  update neko and haxe
  update, use STD env var
  update
  update haxe
  use current svn
  make haxe work again
  latest
  follow upstream, keep latest build
  haxe update: support stable and unstable version, small refactoring
  New TopGit dependency: experimental/multiple-versions-in-one-file
  updates
  haxe update (taken from nix2/marc-next branch)
  new tg branch experimental/haxe
Merge branch 'experimental/haxe' into refs/top-bases/experimental/marc

* experimental/haxe:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/blender

* experimental/multiple-versions-in-one-file:
Merge remote-tracking branch 'refs/remotes/gh/experimental/blender' into HEAD

* refs/remotes/gh/experimental/blender:
  fix
  drop broken blender versions
  New TopGit dependency: experimental/multiple-versions-in-one-file
  blender requires libXext
  implementation
  new tg branch experimental/blender
Merge branch 'experimental/blender' into refs/top-bases/experimental/marc

* experimental/blender:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/xsbt

* experimental/multiple-versions-in-one-file:
Merge remote-tracking branch 'refs/remotes/gh/experimental/xsbt' into HEAD

* refs/remotes/gh/experimental/xsbt:
  New TopGit dependency: experimental/multiple-versions-in-one-file
  adding xsbt
  new tg branch experimental/xsbt
Merge branch 'experimental/xsbt' into refs/top-bases/experimental/marc

* experimental/xsbt: