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

explicit_merge of '67a7cd199ed48c512b8405c701f22fe1fd94bd17'
              and 'd4bebe8bd4a495c716a9547b0a5aabad739ab5b8'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

14e90875fff476f1c8487d781e44c8d9f83179d5