merge of 'a33b3d19ac330b59af9dbbb80b1410d4579bba26'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Feb 2008 14:46:23 +0000 (14:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Feb 2008 14:46:23 +0000 (14:46 +0000)
commitd61b86d159c74b2ced31e08484935bed476861ee
tree4c67bace89efce52bb57ef29d91d9072127bd82f
parentdad6d1a65d4ba3d737e227795d68d9996f1c29c0
parent832b6f875de55193a1c4a4c87f54e95cdaa3e407
Merge ... 'a33b3d19ac330b59af9dbbb80b1410d4579bba26'
     and 'cf95baceadabcd81db8870bc4477337b22deeacd'