merge of '8f22e308a4f1e472b6ee43eeed9d095c75c88fa2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Dec 2007 21:33:30 +0000 (21:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Dec 2007 21:33:30 +0000 (21:33 +0000)
commitd8dfc30d8de91f68dfe1ee9144452a10ed9c88d1
tree5c8270a5c36bd5c11214285f1855c4b33cfb23c8
parentcbb24192ca45b84b2a3997e24b0d3dd402bded26
parentad67bc0fb022d5531f19430f7ccdee951379ac86
Merge ... '8f22e308a4f1e472b6ee43eeed9d095c75c88fa2'
     and 'dcd43331e77a5ffe94fa8288214499b163cb6021'