merge of 417b6b1ab4151082a038c4eb1bc88276a46675b0
authorJustin Patrin <papercrane@gmail.com>
Fri, 7 Oct 2005 16:59:31 +0000 (16:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 16:59:31 +0000 (16:59 +0000)
     and d158643df91483ff93864d58c92e889b0050dea6


Trivial merge