merge of '266509b97479fd932511cb63332861a369849008'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 6 Mar 2008 13:24:13 +0000 (13:24 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 6 Mar 2008 13:24:13 +0000 (13:24 +0000)
commit151938cb326f8b63dbd32d9663f35b36e3b482ae
treedf3b58e312ff997e29489bd3a252a5a25cac1ae0
parent4d25ad47736218ef2c07e8d0dac3d4ba827bbc3a
parentc6f8cfd3e83ff2fd4c8c7cd93dfa9681bbf46010
Merge ... '266509b97479fd932511cb63332861a369849008'
     and '794e1f022e3fc8866fcadb5c7158d8521fc62a1c'