From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 3 Feb 2006 02:29:23 +0000 (+0000)
Subject: merge of 0a4dda033896ff5bcc2aac99f0ac7064e34f6cd6
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9cd0ef0cfd2ae1e8b9d8da4db76e9e69a48d112;p=openembedded.git

merge of 0a4dda033896ff5bcc2aac99f0ac7064e34f6cd6
     and 5ffc1b1540c0c7e039758bae429eea419195f09b
---

d9cd0ef0cfd2ae1e8b9d8da4db76e9e69a48d112