merge of '414cac1c77ff9fa2877bf185b1fb201f034ee108'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 10:58:00 +0000 (10:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 10:58:00 +0000 (10:58 +0000)
commitb36aaa0e6238f8a966561edb444f4661e84b801d
tree45410f790eba151dcab5ac736b82a8465002295e
parentc34cbde492b6c7720a5a315f2d98c3240f7055b8
parent543055f847be4ac652a340298b5abe21a93cc769
Merge ... '414cac1c77ff9fa2877bf185b1fb201f034ee108'
     and 'bf8b52c7c7ffdfe7cb88423cc23d4eeb9c573c2f'