merge of 'a87697026a73f10984708224b490659d3ce0d804'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Nov 2007 08:12:34 +0000 (08:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Nov 2007 08:12:34 +0000 (08:12 +0000)
     and 'e6bf3fbc989603ad89a8d4ca27d7be41e6baa763'


Trivial merge