From: Koen Kooi <koen@openembedded.org>
Date: Thu, 2 Mar 2006 17:43:42 +0000 (+0000)
Subject: explicit_merge of '09145be36a071f7c39a4d421da54e87a449cecc1'
X-Git-Tag: Release-2010-05/1~9453^2~2304^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=966f3a94af2c83ffd2c634171fbe04917731b6f9;p=openembedded.git

explicit_merge of '09145be36a071f7c39a4d421da54e87a449cecc1'
              and 'bad62b438dd2c5c176aff6068068f022faa98dbb'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

966f3a94af2c83ffd2c634171fbe04917731b6f9