merge of '43f3239a38fe8320840562c313bed88960624d04'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Jan 2007 16:36:30 +0000 (16:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Jan 2007 16:36:30 +0000 (16:36 +0000)
commitcfb2bd5dd31e6664b9239c123a0223252d60d5bf
tree2aa36e8b305232ef6e0c985e285df9558d85455c
parentf7dd688d69e27686c80c8d169e0c89566ca4d8b5
parente4bb1d5b07c5fea99e6f308b6b6ab7b238ca5329
Merge ... '43f3239a38fe8320840562c313bed88960624d04'
     and 'fe7afda01b0900886e5c9d3d14655f2739680faf'