merge to master

EXAMPLES

@@ -30,6 +30,7 @@ included, please mail to `the Google group
 * mpmath: http://mpmath.googlecode.com/svn/trunk/doc/build/index.html
 * MyHDL: http://www.myhdl.org/doc/0.6/
 * NetworkX: http://networkx.lanl.gov/
+* NOC: http://trac.nocproject.org/trac/wiki/NocGuide
 * NumPy: http://docs.scipy.org/doc/numpy/reference/
 * ObjectListView: http://objectlistview.sourceforge.net/python
 * OpenLayers: http://docs.openlayers.org/