merge of '328e55791e71db3003684a8030a9577de72e294a'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Feb 2008 00:55:59 +0000 (00:55 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Feb 2008 00:55:59 +0000 (00:55 +0000)
     and 'd4732f85d42b87e990dd3cdfed1c9d40f04ff5e8'


Trivial merge