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/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