merge of 5d9c9e1e7d8e9bfb4ecb318701b739f787d59842
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 17:16:28 +0000 (17:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 17:16:28 +0000 (17:16 +0000)
     and 71481bacc3f57287881719e7dcde5ecfa6fd8492


Trivial merge