merge of '19cc277b1dfcb0e738eecf65fa9d252b6119c886'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Aug 2008 00:56:52 +0000 (00:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Aug 2008 00:56:52 +0000 (00:56 +0000)
commit729ec79d8d04171cca575c898707833f745a90d1
treec5bd2bc97be0f7d9008b01db06862e7ad04d20b3
parent537bec400cb35bfa94db58dcde0454c542ec3500
parent06630a469cda2e779b8ccf3de125f18569cb67b1
Merge ... '19cc277b1dfcb0e738eecf65fa9d252b6119c886'
     and '9f68e99b72ccd68939ca1cab014d1e79dd390bc4'