merge of '14192674bf83ffad052bdcede44d1d342962d3cf'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 13:47:24 +0000 (13:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 13:47:24 +0000 (13:47 +0000)
commitdf936a73f8364e618f88d4675282188850835bfb
tree194ecc201a44597634613112437d1942539059a0
parent0cfd5ed617e7ff9b2f1d775df0292b152d8b412d
parentf39e16f9378630281f5f6e7d17bddd8c7b82169b
Merge ... '14192674bf83ffad052bdcede44d1d342962d3cf'
     and '8dd93c6476c0007dddb9f4352def801f43f16339'