merge of '3cb55f3839ae88970dfa5acd881fccfbd3a79fc8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Sep 2007 00:43:56 +0000 (00:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Sep 2007 00:43:56 +0000 (00:43 +0000)
     and '46598fbaed38fc3e79d96b6bb061410fbea84c3d'


Trivial merge