merge of '1fc9d550468a28c01730e8075da9eb6354279e82'
authorKoen Kooi <koen@openembedded.org>
Wed, 13 Dec 2006 22:22:36 +0000 (22:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 13 Dec 2006 22:22:36 +0000 (22:22 +0000)
commit48785a3b7179e9f3385289d4e15216f4c2e5ed3e
treeda5103fc489e5ca0d0101673f0a49258207b8b42
parentacd63896986e7355cb6d1be79d2607436844c95a
parent1635ee6f41cd2eb114babb739f44eb99d70b3f5a
Merge ... '1fc9d550468a28c01730e8075da9eb6354279e82'
     and '7dc5c6145f5a9f64aba3521e24e1a0b1ff7f0e0e'