merge of '32fb34a3d6b83b091f671bba6f6fb90146a59544'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 5 Nov 2007 20:06:00 +0000 (20:06 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 5 Nov 2007 20:06:00 +0000 (20:06 +0000)
commitf60dc422cfcbcba2da38b4d1fcf033a42e4906e1
treeda1e95626bc6e81bd540155c6b4b595777ea56e6
parenteefc1d962f85e434c060c09c8105e6eac8074564
parent92b995d7bd8e3e45a61ff52063105c490f1aee55
Merge ... '32fb34a3d6b83b091f671bba6f6fb90146a59544'
     and 'aa0124fac8e1daf7beff69f5b6b4921d8ffcf7b3'