From: John Bowler <jbowler@nslu2-linux.org>
Date: Wed, 4 Jan 2006 01:24:34 +0000 (+0000)
Subject: merge of 9d518c785db1a806d81a8aacc799725428e542f4
X-Git-Tag: Release-2010-05/1~9453^2~2771
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3856362ff9f118e1fa8308b847a4bc9a2f5850ea;p=openembedded.git

merge of 9d518c785db1a806d81a8aacc799725428e542f4
     and d5e1bc9b9d3db68b87987517770deb9a389f8333
---

3856362ff9f118e1fa8308b847a4bc9a2f5850ea