merge of 2f4be4bda0bc32eb72174daa1ac365050b7a9d85
authorRod Whitby <rod@whitby.id.au>
Tue, 9 Aug 2005 15:02:25 +0000 (15:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Aug 2005 15:02:25 +0000 (15:02 +0000)
     and 42695d2917826b4ecd949ee4cce709f6f04fc54c


Trivial merge