merge of '27992ad903b456bde0a40788a183fd1b84d95beb'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 13 Oct 2006 12:50:54 +0000 (12:50 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 13 Oct 2006 12:50:54 +0000 (12:50 +0000)
commitdd2f90517abf4a7b2b077c94b69d59306b82cc7a
tree2622385f785f240a58ddf696505ccf8b8b03dee7
parent26ca29239b96f861bf1ddd7dd3ab78785639d558
parentceeaf021ab442b78b12c3e15e1b6d0916df16dcd
Merge ... '27992ad903b456bde0a40788a183fd1b84d95beb'
     and '53955feff65d45d63101347b169233ef5920c1b5'