merge of '38b07284e4ef593d57320c1d1b3224ef07f91137'
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 15 Nov 2006 10:51:03 +0000 (10:51 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 15 Nov 2006 10:51:03 +0000 (10:51 +0000)
commit63c38c11a546895fe5573d0ca59d054d0ea8fbce
tree39cc7fbf471eed34381e1b6349a89e6e1c08f3c7
parent6f626550a0122f8adcc853dcfcd5f2a90d625b0e
parenta7bb358100f67ec64a64a996e66e919f2c692df7
Merge ... '38b07284e4ef593d57320c1d1b3224ef07f91137'
     and '3c5d934a8f839cba0ad4f74fbaac96826767a899'