merge of 40d10bcbb5038258ca03225d0154ca5e48858b4d
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 22:18:24 +0000 (22:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 22:18:24 +0000 (22:18 +0000)
     and da977902d209ed78b9d35354ede0aa20347a5f1d


Trivial merge