merge of '9145fc8b71029fb9ef74ec089e40d4b29737efe8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 Aug 2006 14:08:32 +0000 (14:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 Aug 2006 14:08:32 +0000 (14:08 +0000)
commit1f4d6579866e58bd965bc649ae221eb07b6bd538
tree8e5a6e0b7fe7aa29c72935d4254e99ef555ce72b
parent744e42a07d1f37859e3ec3741a45f11ee55d9307
parent6169bd3157d4a8b1afb0100c16037d993d451e3d
Merge ... '9145fc8b71029fb9ef74ec089e40d4b29737efe8'
     and '99f8110819f972fd2da3d1fb600f0c86319569ca'