merge of '2c34202b0dfd11794a79da2cd891a88adbfcea48'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 12:09:46 +0000 (12:09 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 12:09:46 +0000 (12:09 +0000)
commit06312eba71432aa2d9e0ed64ebacefd09b12b245
tree0392c185c64658ab1edea11dcad0a375a507352e
parent2b08254beae049c1bdffaf56c62daa2b7ffb6fe2
parentfb42c31e81c2d2a21272a0cef6dd92c0664c7cfc
Merge ... '2c34202b0dfd11794a79da2cd891a88adbfcea48'
     and 'fd02aa1602a7d21248a66f67a25e6435c8443a48'