merge of '36133f7d8e7f5d20b7036c64abff8ec2452f0282'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jan 2008 08:06:48 +0000 (08:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jan 2008 08:06:48 +0000 (08:06 +0000)
commitb7546e3f46c52c23ab2cfbf0a0b1e13597cd20ef
tree1a90eec6d43d7bf4b7f12f2d3de3e8de24097152
parent937675435a1f0e44511bdc8ff6ef1d5d4029d5b8
parent2c7c8e8d65c63b9492ccc6f754fed2a4307908cd
Merge ... '36133f7d8e7f5d20b7036c64abff8ec2452f0282'
     and 'cec9ba770f42c95b32a71550f948c06c6fdf7e48'