merge of 282bd719dad582050c3698357176c4c2a53181da
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 7 Feb 2006 08:09:48 +0000 (08:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Feb 2006 08:09:48 +0000 (08:09 +0000)
     and 7bd8e93854d7d1cbf3ae66788c128c85d9f80d0d


Trivial merge