merge of '541a0c310166fc18c9883d31cbdbca82af3c977c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Sep 2007 13:10:01 +0000 (13:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Sep 2007 13:10:01 +0000 (13:10 +0000)
     and 'c762de4b1817cfe0d3121333cf187eb52e720fab'


Trivial merge