merge of '23aaca50b161d66de0dd1f96937010f0ad1f1f54'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:48:49 +0000 (00:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:48:49 +0000 (00:48 +0000)
commitda49fe48efae614c0b7b61f99779efae5611f53e
treec535b300bf24b78ba8d917b07c0dc201fcba100c
parentc665e9631f8d5b2953b01390db44fdca3ce74482
parent7e873d9f0c70ca04dea117735b22dd174bbe1b01
Merge ... '23aaca50b161d66de0dd1f96937010f0ad1f1f54'
     and '7dbeb5e383fa2bee20df397e69caddaee824c644'