merge of '65bea2472f8d53c3d2f8f8e784ede9b9a84f0af8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Oct 2007 23:03:17 +0000 (23:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Oct 2007 23:03:17 +0000 (23:03 +0000)
     and 'cc0f788a513b8c6fcf2e55f8c9e0fb35c6f5c016'


Trivial merge