merge of 'b6faf2a6dc98242794af36b6508ba20768cf5c33'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 12:04:53 +0000 (12:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Oct 2007 12:04:53 +0000 (12:04 +0000)
commit0ecee6a506355566f8ba69de6f26d7c79354288d
tree646cd538847ad4e1b3a9835755efd81545e45e63
parent13768a336a8a1d956b828007d4e29b7cd9849c84
parent21cedfc3833d24082f3560dc99f929ad64bc47ce
Merge ... 'b6faf2a6dc98242794af36b6508ba20768cf5c33'
     and 'd0704c3a8d828eb2cff883ccdb195cd29eb07488'