merge of '16f0fa7ec858ba228dd9d241b0cff7a309a42dff'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Mar 2008 23:09:10 +0000 (23:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Mar 2008 23:09:10 +0000 (23:09 +0000)
commit4eed8953330ec0271dbc366f4f7f619740a8875b
tree65f3fcd879be6b814dfc03290aa1d2ced8d9f17a
parente6985b5c0b33823d00081c6276da87e9d35b46c5
parenta526b2c8b8f286a02ce0045b36ad44b300cb93e7
Merge ... '16f0fa7ec858ba228dd9d241b0cff7a309a42dff'
     and '8a98b05914e98533aa6ec6041337074cd4a83fe6'