Merge remote branch 'alioth/master'

* alioth/master:
  added joblib and sphinx into the listing for ease of tracking

diff --combined neurodebian.cfg
index e871ea7c75ad22667bbf5419ab9519be1e5c7576,35edbd1902c43f389b497f3ac3064dcc2cd93776..caab129a3a7d8cd0c6419dd4b79de78505ed3e19
--- 1/neurodebian.cfg
--- 2/neurodebian.cfg
+++ b/neurodebian.cfg
@@@ -21,7 -21,7 +21,7 @@@ select taskfiles 
  select names = libnifti2 odin mitools afni-atlases python-pyssdh python-networkx
   r-cran-glmnet python-rpy2 python-nibabel-snapshot
   python-scikits-learn python-mdp python-mlpy python-openpyxl libgdf-dev matlab-support
-  svgtune rorden-mri-tutorial caret-data
+  svgtune rorden-mri-tutorial caret-data python-joblib python-sphinx
  
  # Information about prospective packages to be imported from taskfiles
  prospective =
@@@ -58,13 -58,6 +58,13 @@@ us-ca = http://neurodeb.pirsquared.or
  us-nh = http://neuro.debian.net/debian
  us-tn = http://masi.vuse.vanderbilt.edu/neurodebian
  
 +[mirror names]
 +de = Germany (University of Magdeburg)
 +gr = Greece (Aristotle University of Thessaloniki)
 +us-ca = USA-CA (Paul Ivanov)
 +us-nh = USA-NH (Dartmouth College)
 +us-tn = USA-TN (Vanderbilt)
 +
  [neurodebian]
  # Release files of all repositories to be contained in the website
  releases =
@@@ -120,7 -113,6 +120,7 @@@ jaunty = nd09.0
  karmic = nd09.10
  lucid = nd10.04
  maverick = nd10.10
 +natty = nd11.04
  
  [nitrc ids]
  afni = 23