merge of '0f34f029ae013c8424b0693e3c1017d67649c235'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jun 2008 03:36:42 +0000 (03:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jun 2008 03:36:42 +0000 (03:36 +0000)
     and '5d3853ec3fe837b91ad1001620a445344aeae8d8'


Trivial merge