merge of 6a57c3e22fd06a31041fbb55ad83504a24c0b864
authorRod Whitby <rod@whitby.id.au>
Thu, 1 Dec 2005 20:47:23 +0000 (20:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 20:47:23 +0000 (20:47 +0000)
     and dd8083dd620f2b95bcfa4b4878d1c64240995a10


Trivial merge