merge of '333e287567474447d260204effba70e5e0c2eb71'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 17 Jun 2008 18:44:39 +0000 (18:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 17 Jun 2008 18:44:39 +0000 (18:44 +0000)
commit5ee36df5241a55614b54bc489f83ba475c8e6606
tree0d65ff9cd1ccd93437b2cd1ee985295d9ac21905
parentda842471e7887a9b430f042c521fab06edeb9f5a
parent8710c0212e53c8ee9c8e89d9990a07b840ae377c
Merge ... '333e287567474447d260204effba70e5e0c2eb71'
     and 'f0144e2c5085d88cf1861c146d6e33c2653a222e'