merge of 'b3a0ae7ae12db4c4db9d0e3b6c0b7dc12d016de8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jun 2007 19:23:21 +0000 (19:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jun 2007 19:23:21 +0000 (19:23 +0000)
     and 'f1f6c3162864d453a8850ecb87b1994f9b160b9d'


Trivial merge