merge of '68653f0e949fe7055f2dc011744ee97ae437d2e8'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 12 Aug 2007 12:21:37 +0000 (12:21 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 12 Aug 2007 12:21:37 +0000 (12:21 +0000)
     and 'b3274bff48897f5f043f1256c823866ff6981f15'


Trivial merge