merge of '49b1d83eae7f83143eba2ca3c77c40ebb33a61cc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 01:23:16 +0000 (01:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 01:23:16 +0000 (01:23 +0000)
commit3c011708443e648c0fdc52c796215266fbb95d4a
treec142ee7b379dc20c0d3bae3844bcb11583a43ed2
parente96e82cd7ee95d712e2c68f2f9540bdfe727645b
parentc947d9a9b96f0e941714255854f4dbb35d080490
Merge ... '49b1d83eae7f83143eba2ca3c77c40ebb33a61cc'
     and 'ae2c3da1cb5d209add155e318d2befb8b40328b6'