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)
     and '9f68e99b72ccd68939ca1cab014d1e79dd390bc4'


Trivial merge