merge of '0392f48f534dce561d4b8cb01e8db5ad64500222'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 12:41:00 +0000 (12:41 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 12:41:00 +0000 (12:41 +0000)
commitf66378d955987691415e8f4786f87f92f5303241
tree19ff2613e347a3f73f2e029040256abcac1ffe8c
parent54459388bca56e8cccefe0799082a958e5b8a709
parent4713d888ebcf7e0a9064346bf3f0a86d22ad7129
Merge ... '0392f48f534dce561d4b8cb01e8db5ad64500222'
     and 'a141267452dde7cd1e229a81095e09d64b4c3e9d'