merge of b7caf8f6d4169c1c8831f9278bfd58e9e26f1f16
authorRod Whitby <rod@whitby.id.au>
Wed, 24 Aug 2005 02:28:08 +0000 (02:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 02:28:08 +0000 (02:28 +0000)
     and e783539488fcda20e1c43df96f5922c3a22d7839


Trivial merge