Merge commit 'upstream/2.6.3'
authorJoel Rosdahl <joel@debian.org>
Sun, 20 Feb 2011 15:52:37 +0000 (16:52 +0100)
committerJoel Rosdahl <joel@debian.org>
Sun, 20 Feb 2011 15:52:37 +0000 (16:52 +0100)
* commit 'upstream/2.6.3':
  Imported Upstream version 2.6.3


Trivial merge