merge of '6279441596d7826ca811822cd78f2118f9eb57e2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 May 2008 01:25:58 +0000 (01:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 May 2008 01:25:58 +0000 (01:25 +0000)
     and 'e667f22b2fcceae83ed7110622269ddd2194a9b8'


Trivial merge