merge of '228dd3777f4e26267c87ee4671f6679f5fecf430'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 14:57:55 +0000 (14:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 14:57:55 +0000 (14:57 +0000)
     and '420e11219be7df649557c4bbcdec50538362cb21'


Trivial merge