merge of 0cca75bf60d8910a9f3746cfcf54fae56e50a758
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jan 2006 22:00:25 +0000 (22:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 22:00:25 +0000 (22:00 +0000)
     and 84cacf0306830aa7f116a84e41a65ab4e2d8a7b9


Trivial merge