From: Koen Kooi <koen@openembedded.org>
Date: Thu, 2 Mar 2006 17:54:35 +0000 (+0000)
Subject: explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'
X-Git-Tag: 2.6.0~1852
X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=40ce95ca64d662c16cec3d1efabc966dda5a2610;p=vuplus_openembedded

explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'
              and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
   using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
        to branch 'org.openembedded.dev'
---

40ce95ca64d662c16cec3d1efabc966dda5a2610