merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
authorDerek Young <dyoung@nslu2-linux.org>
Tue, 30 Aug 2005 18:01:12 +0000 (18:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 18:01:12 +0000 (18:01 +0000)
     and ce0d2a7a95e1c417c4b1e7e0aa729d1a4c37f6ee


Trivial merge