merge of 089249369750f63e5367ef0ab91c190f50ae55e9
authorJustin Patrin <papercrane@gmail.com>
Tue, 16 Aug 2005 22:04:52 +0000 (22:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Aug 2005 22:04:52 +0000 (22:04 +0000)
     and 093694eab501a28fcb36f83dedad796958b7a9ce


Trivial merge