merge of 6217b7556df1e286940ec0d23fad92ab2f91eaa3
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 16:47:28 +0000 (16:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 16:47:28 +0000 (16:47 +0000)
     and 9b38a150f49864b478f6d3a1dcf6a63e6d7fa4e8


Trivial merge