Merge branch 'sphinx'
authorIonutz Borcoman <iborco@gmail.com>
Sun, 20 Mar 2011 11:44:33 +0000 (13:44 +0200)
committerIonutz Borcoman <iborco@gmail.com>
Sun, 20 Mar 2011 11:44:33 +0000 (13:44 +0200)

Trivial merge