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)
commit053709636a104402b9f0b6f0f008b048f436a7c9
treee5d66d487af528205df633378eb0f5cb7264b38e
parent732806cfc2424f6e0a224dcc9e15774478d2ffb0
parentf408bbb40acd28e4cec46fe0ca633f46e9e2ebd7
Merge commit 'upstream/2.6.3'

* commit 'upstream/2.6.3':
  Imported Upstream version 2.6.3