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)
commit40ce95ca64d662c16cec3d1efabc966dda5a2610
treec5687492fbbc7f7e46b8db8448b1da640fef9955
parent858ca7bc53e7c03eac036217486e87e36eb1e3e6
parent966f3a94af2c83ffd2c634171fbe04917731b6f9
explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'
              and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
   using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
        to branch 'org.openembedded.dev'