merge of '05ddfe24471c42c447a6996f4ee8a09bbd402e23'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 22 Jan 2008 09:15:26 +0000 (09:15 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 22 Jan 2008 09:15:26 +0000 (09:15 +0000)
commitf77dba0558b19ea552a5655fa38dc70f75b00994
tree52bf00301a315bc09b0a4ff51712dcad383c5821
parent4c3748399593d37732e2c966da2f0c8b7a16c044
parentad909125e601f5ac8e2de458dbeea845930a4dc7
Merge ... '05ddfe24471c42c447a6996f4ee8a09bbd402e23'
     and 'ee28a8fbd4b4c0cc97fe47467c837fb525ecdf82'