merge of '8e186034e744815050d62541776a4d037e5d320a'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 21 Jan 2008 01:16:05 +0000 (01:16 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 21 Jan 2008 01:16:05 +0000 (01:16 +0000)
     and 'eed8e44709b0135c476bb86fd537e46917805a76'


Trivial merge