Merge upstream.
authorMichael Elsdörfer <michael@elsdoerfer.info>
Thu, 14 Jan 2010 18:27:22 +0000 (19:27 +0100)
committerMichael Elsdörfer <michael@elsdoerfer.info>
Thu, 14 Jan 2010 18:27:22 +0000 (19:27 +0100)
commitbb18417a31088bb12bc23a4d1fe4cd8d7430cd63
treeff954df24083c9c53a2e10f538f8d37fd7206496
parent28e1c6d3cf8eb8282f5a02361f1f72a619832572
parent43184b7c76a94f4e6ee148ee9f6c4d4fc648dc78
Merge upstream.