merge of '0cfef0fdcd39ce49077acb4218058948a07ba70f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 14:42:37 +0000 (14:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 14:42:37 +0000 (14:42 +0000)
commit2d9c5fdc3308a487ce0e0d07e2de1b227abc54e7
tree9439d7e836ffffbcf80084d99fb74265bfbefe58
parentab9b018ebdc0673c65d69016a6b4c354af62980e
parente40c4bc863160289dbd9d0e7bc5164c0c9ecae7c
Merge ... '0cfef0fdcd39ce49077acb4218058948a07ba70f'
     and 'e60a36ce97927c0d8ad36cace5dc291638e20694'