From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 3 Jan 2006 23:38:29 +0000 (+0000)
Subject: explicit_merge of '12e4d92e98860b8d7e48bdb73bfd9efb0e0a7c21'
X-Git-Tag: Release-2010-05/1~9453^2~2772
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00f830a1dc2c74a8052f85e3a42801d65cf1e9f2;p=openembedded.git

explicit_merge of '12e4d92e98860b8d7e48bdb73bfd9efb0e0a7c21'
              and '7de90a055904c4af8890dd5ae8c192bfd41b3fa1'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

00f830a1dc2c74a8052f85e3a42801d65cf1e9f2