merge of aabbfb8517118db142fd2350142326ea9089f210
authorRod Whitby <rod@whitby.id.au>
Tue, 8 Nov 2005 12:49:48 +0000 (12:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 12:49:48 +0000 (12:49 +0000)
     and c1e11e88425fea080d1af8514734c6caa36c4be5


Trivial merge