merge of 1f23f78bb018ef9ead8f831e7653c095cbe8c3ae
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 19:20:06 +0000 (19:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 19:20:06 +0000 (19:20 +0000)
     and b567e2cc931d36f704f32c2c731b800fa6b83a18


Trivial merge