From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 06:51:27 +0000 (+0000)
Subject: merge of 3fb414835838a0d53a0dc370c4a0c87cfec614eb
X-Git-Tag: Release-2010-05/1~9453^2~2455
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdead074e60a1221f8fe372046bcddb0a7ab938d;p=openembedded.git

merge of 3fb414835838a0d53a0dc370c4a0c87cfec614eb
     and 8703efdf079cb272c994f94de7414694d20cc052
---

bdead074e60a1221f8fe372046bcddb0a7ab938d