merge of 0241a34ef686562063ef44062a77a85c9c8343ca
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 7 Jan 2006 17:33:34 +0000 (17:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 17:33:34 +0000 (17:33 +0000)
     and 37e4e397cfd639a4c09ed7c5f8d5a23a81a966c7


Trivial merge