merge of '091a7ba3a2af9d82db7d91f98962b340d3dc64d2'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 26 Aug 2006 21:30:30 +0000 (21:30 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 26 Aug 2006 21:30:30 +0000 (21:30 +0000)
commit545325fa6db7d13533cb043287939dd95689ce1a
treee53005c45cbf8977707aa0b7049e7140b13d2329
parentcdc1540fc3663a231dcc22bc9b95dc94473bd817
parentb09fe32ebb5375215820ba5b2f2def3a8b7db730
Merge ... '091a7ba3a2af9d82db7d91f98962b340d3dc64d2'
     and 'c8c8e34a5827662a4d603c1978a1d2719cda9679'