From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 01:56:14 +0000 (+0000)
Subject: merge of 22dc71271d5b2f33b17e7dbea3e143f38d85c8d7
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df2ca404d57c31ad1d5d05673a0830efb4b7038a;p=openembedded.git

merge of 22dc71271d5b2f33b17e7dbea3e143f38d85c8d7
     and 382394264d43c74e3d6cc3b5438f2dc2322ba657
---

df2ca404d57c31ad1d5d05673a0830efb4b7038a