merge of 'ab5ad4e59f4a6f702c25734887b847d5f8f38376'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 16:17:04 +0000 (16:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 16:17:04 +0000 (16:17 +0000)
commit0938c144f1633b72488e118c38bae614819e340f
tree348892e8f8b42c509d36a244408f47e7563eabda
parent8513eceffb26f126b288cadf13c245580d3963bd
parent6ebb9b88ae170d1920d905d879e15a09e100bafd
Merge ... 'ab5ad4e59f4a6f702c25734887b847d5f8f38376'
     and 'afa1166259e2b444217408569230c95f8384ac5f'