merge of 1a138e228b9a27d00855a6c27775e9b2430220a2
authorJustin Patrin <papercrane@gmail.com>
Mon, 17 Oct 2005 23:15:06 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Oct 2005 23:15:06 +0000 (23:15 +0000)
     and b7f6ccdd490a93fd12ab881d78d03c39cc31ecba


Trivial merge