Merge remote-tracking branch 'alioth/master' into newdesign

Merge remote-tracking branch 'alioth/master' into newdesign

* alioth/master: (40 commits)
  ENH: added info/links for VM 6.999.b4.20121231
  vm: purge dkms build dir, freepats, fix removing of apt lists
  BF: list neurodebian as release, not unstable -- we haven't yet ever uploaded to Debian proper
  Changelog for 0.30
  BF: nd_build_testrdepends - pass distribution to build-rdeps
  ENH: Install octave by installing qtoctave
  BF: do not exit non-0 if lightdm.conf is not present (squeeze VM)
  comment out using of -devel repo and manually build one for squeeze for testing
  BF: move -u in nd_build down so we get sensible help
  Build a new dev1 pkg
  VM: depends on zenity, install ipython01x only for older ones, default XFCE4 pannel
  ENH: install lightdm, default login for brain, urxvt (+tune ups) as default console
  ENH: vm - while developing use also -devel nd repository
  exclude debian-devel from being wipedout upon upload-website
  ENH: tune up Tiziano's changes so we could process options from cmdline
  preseed.cfg becomes an .in for Python string interpolations
  ENH: nd_build_testrdepends -- sign the temporary repository with the package (use apt-ftparchive)
  ENH: Make neurodebian.cfg also visible on the website so we could easily fetch up-to-date version if needed
  ENH: improved nd_querycfg a bit: query content of a section or list of sections
  Changes for Lin4Neuro from Kiyotaka Nemoto
  ...

Conflicts:
	sphinx/index.rst
	sphinx/vm.rst