merge of 39a77001ea8e83e4668aac829096b729bcc93056
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 5 Dec 2005 18:24:28 +0000 (18:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 18:24:28 +0000 (18:24 +0000)
     and 5b5b8b71487defdcc39752dd5f29638b15be8a3d


Trivial merge