merge of 188899a39ad7b9fa56483bbf49b6b859ecc6e093
authorJustin Patrin <papercrane@gmail.com>
Fri, 7 Oct 2005 23:08:40 +0000 (23:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 23:08:40 +0000 (23:08 +0000)
     and ec89fc8d46b882e4c955d663aca4d4ce85552700


Trivial merge