merge of 5302bee687f8bd56d8af70745304af2f59c19ec3
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 14:17:38 +0000 (14:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 14:17:38 +0000 (14:17 +0000)
     and ac2b9a5563ecd104e4cbc35df4128a369b2279b2


Trivial merge