merge of 'bb3574ca77780e28d3528182eaeb7cda963c4974'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 3 Feb 2008 00:13:43 +0000 (00:13 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 3 Feb 2008 00:13:43 +0000 (00:13 +0000)
     and 'eea0b13e3079e07cf547a5690026863e07e011bf'


Trivial merge