From: John Bowler <jbowler@nslu2-linux.org>
Date: Wed, 2 Nov 2005 04:09:46 +0000 (+0000)
Subject: merge of 1671361e7579e71d868be23893006f827fbff717
X-Git-Tag: Release-2010-05/1~9453^2~3152
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff245f6bb447698a3b996b5faa506f20e1604a9e;p=openembedded.git

merge of 1671361e7579e71d868be23893006f827fbff717
     and 57d918c4d3b1b0b352541f3d7274331f8e9002bd
---

ff245f6bb447698a3b996b5faa506f20e1604a9e