merge of '9ddee6d313b8df8d5c53bbbdff56ee8fad2b2a17'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 20:56:56 +0000 (20:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 20:56:56 +0000 (20:56 +0000)
commit82266fc0cc7692fcb19d86a62e628727fad32257
tree8a2298dbac9d28ee6ba61cd18fa5768c37bf4f8d
parent531d164e9642b8ea066113c051efd4076fab8ed8
parent041803305e48a81ddf300b4e4f84d7fda71875db
Merge ... '9ddee6d313b8df8d5c53bbbdff56ee8fad2b2a17'
     and 'cfb319cb7a07884581f37a430f62b7e11bfb6376'