merge of 18e90deffbe7500d559fd5a3e6ad96258087772b
authorDerek Young <dyoung@nslu2-linux.org>
Sat, 17 Sep 2005 13:09:25 +0000 (13:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Sep 2005 13:09:25 +0000 (13:09 +0000)
     and 597b1f057c7b7f29333d19ebf0b1c777db0569a9


Trivial merge