merge of 0bbfeca4a5e914b371359c7f066b9731f637102a
authorRod Whitby <rod@whitby.id.au>
Mon, 30 Jan 2006 23:31:55 +0000 (23:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jan 2006 23:31:55 +0000 (23:31 +0000)
     and cd257fc3be2c2b6a6d43881ec1ebc7fd3b1608ff


Trivial merge