merge of c680327153be372712b73770b77507e942065816
authorDerek Young <dyoung@nslu2-linux.org>
Fri, 2 Sep 2005 13:00:50 +0000 (13:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 13:00:50 +0000 (13:00 +0000)
     and dca105f1fe9254d31ccb9591f46b4c0cefcb2ecd


Trivial merge