merge of 20908dd2ac3934b841281cc067b55d92b071b172
authorDerek Young <dyoung@nslu2-linux.org>
Mon, 29 Aug 2005 22:32:24 +0000 (22:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Aug 2005 22:32:24 +0000 (22:32 +0000)
     and d05618e2ffb76c986540067b57ddf9113d582627


Trivial merge