merge of '2a64651f43431cae21806db78517b7481f421733'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 16:19:21 +0000 (16:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 16:19:21 +0000 (16:19 +0000)
     and '522710aedfdaaa917b29d9efccf340e5109071bd'


Trivial merge