explicit_merge of '09145be36a071f7c39a4d421da54e87a449cecc1'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Mar 2006 17:43:42 +0000 (17:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Mar 2006 17:43:42 +0000 (17:43 +0000)
              and 'bad62b438dd2c5c176aff6068068f022faa98dbb'
   using ancestor ''
        to branch 'org.openembedded.dev'


Trivial merge