merge of b429c0f1af49e05679400d4ba67f96a25e2b4316
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 7 Aug 2005 19:53:15 +0000 (19:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 19:53:15 +0000 (19:53 +0000)
     and c9a59c1ab8b4309afa4a724e1a72443b01fd97b8


Trivial merge