From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 10 Jan 2006 01:10:55 +0000 (+0000)
Subject: merge of d2b50db8c3a2dfa93a56f34063e7e78182ac274c
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be954a5547b18eb5f78c22fa36000eab2daa3655;p=openembedded.git

merge of d2b50db8c3a2dfa93a56f34063e7e78182ac274c
     and ef11dd4e8067d9c4f020b6cd39b8556bab34dc7a
---

be954a5547b18eb5f78c22fa36000eab2daa3655