Merge commit 'upstream/2.6.0'
authorJoel Rosdahl <joel@debian.org>
Sun, 16 May 2010 13:32:11 +0000 (15:32 +0200)
committerJoel Rosdahl <joel@debian.org>
Sun, 16 May 2010 13:32:11 +0000 (15:32 +0200)
Conflicts:
doc/sphinx/conf.py


Trivial merge