merge of '149310239f998cfc86d02285d82e0e7883c1507e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Feb 2007 19:48:29 +0000 (19:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Feb 2007 19:48:29 +0000 (19:48 +0000)
commit4bac67ace7a25f0db5daffb6ac2900bcb07e7240
tree0aa2975a349598287607bc228ce39983c3f45131
parent2b81a9aa86dc2676eb044c7c8e9eab2890ed01bf
parentfcb8f61f5a248ab1533bfd235ed292ee7e4668bf
Merge ... '149310239f998cfc86d02285d82e0e7883c1507e'
     and '5e37839a8996de586ed9a70c6c599cc4cc746041'