merge of 7ee355e4a1fa85e49dcae218d1aa5b884f75a6e7
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 22:25:17 +0000 (22:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 22:25:17 +0000 (22:25 +0000)
     and eee7e0d8ba89227d29beba3bc804f5340553c590


Trivial merge