merge of 'd734e1412138fc4107a768d25359b9c89f869193'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 13:35:14 +0000 (13:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 13:35:14 +0000 (13:35 +0000)
commit0cfd5ed617e7ff9b2f1d775df0292b152d8b412d
tree73202611caa0760253e801938b1fb440870f2835
parentaa96561f14f0193cce46eb5691880fb2905f6593
parent0ba6ce99f696e7ce63801058b841234c3a40bbf4
Merge ... 'd734e1412138fc4107a768d25359b9c89f869193'
     and 'eb6f56b3844fedf18386caec8d2691373a243c26'