explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Mar 2006 17:54:35 +0000 (17:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Mar 2006 17:54:35 +0000 (17:54 +0000)
              and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
   using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
        to branch 'org.openembedded.dev'


Trivial merge