[SCM] efficient 2D data-plotting library branch, master, updated. upstream/2.0.7.1-18-gaf04081

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit d664b6462b5f4410b6fbd310a095061b518dbd24
Merge: 89448259c6d8318992b49fb895fe2c1b7904e955 1d4263621d922d8d3977ad727cd9b08fbfe16a95
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Fri Dec 17 15:21:35 2010 -0500

    Merge commit 'upstream/2.0.8.1'
    
    Conflicts:
    	doc/conf.py


-- 
efficient 2D data-plotting library