From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 3 Jan 2006 21:53:17 +0000 (+0000)
Subject: explicit_merge of '662a617882f791ea9f9ca8aa0bd50f264d6c1db7'
X-Git-Tag: Release-2010-05/1~9453^2~2773^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64874973f87d493c6376c60d461c5dc4d8f68400;p=openembedded.git

explicit_merge of '662a617882f791ea9f9ca8aa0bd50f264d6c1db7'
              and '00f00d3a48aefe68a725e5e07c63fd5910f1b995'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

64874973f87d493c6376c60d461c5dc4d8f68400