merge of '80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 18:28:26 +0000 (18:28 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 18:28:26 +0000 (18:28 +0000)
commit369199c6947454bea9e88ac9fa2b5ff8cc439456
treed33b3480b803f2e565454530eb3b9f934c3c9070
parent21d933f66c114a9d0972c1c104f8a91a1239dd57
parent873d9b3bc7c6f76354cc3fc11cc68c43ffa65d13
Merge ... '80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9'
     and '877bd2153580c3f0eb7238b370fb1ae786b7b992'