merge of 85a1c1efe7466253130cd2e2a63079154ba54454
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 4 Apr 2006 09:27:59 +0000 (09:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 09:27:59 +0000 (09:27 +0000)
commit414a70ace8cf06857958fad7f87cfcb63b350072
tree71a0005a35f07b5273ebfe337783e692c3262c0a
parent2444331e2870baa9e5bf3978571cc7fc06cd13c7
parent6ce3ce8860572954d283d4ec66364875d66a6d9c
merge of 85a1c1efe7466253130cd2e2a63079154ba54454
     and c67d38b84a548cc9efa81f9371658f5c59e87e43