merge of 9e933b0af0fc064b5d0c5706a3ed1459685dc82e
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 16 Jan 2006 19:15:09 +0000 (19:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 19:15:09 +0000 (19:15 +0000)
     and b34de7d4aba1b19d8802068ebd9f1d15bc5d4da5


Trivial merge