From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 17 Nov 2006 16:33:37 +0000 (+0000)
Subject: merge of '8004ebe0d31a849b3faff027d1ef807246b029ed'
X-Git-Tag: Release-2010-05/1~9453^2~434^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=378b4336d629697bf7e71e6631a221cd5931ed52;p=openembedded.git

Merge ... '8004ebe0d31a849b3faff027d1ef807246b029ed'
     and 'e104d077b009a60b79d4d9002547dd6eae504a71'
---

378b4336d629697bf7e71e6631a221cd5931ed52