merge of 06f3983d464e263927b50412d18a25426951bf5c
authorJustin Patrin <papercrane@gmail.com>
Wed, 31 Aug 2005 18:28:22 +0000 (18:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Aug 2005 18:28:22 +0000 (18:28 +0000)
     and 79ddb5aadb42e7555b58cfa11fd3ffd10d698719


Trivial merge