Merge branch 'master' into gsoc2012
tree40b9d40fd5db6be726976a4d799a118e3d687fb5
-rw-r--r-- 224 .gitignore
-rw-r--r-- 2722 README.rst
drwxr-xr-x - docs
drwxr-xr-x - src