merge of '31da046f926a473ba6aab3543102759603fa6db9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 8 Sep 2006 11:39:44 +0000 (11:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 8 Sep 2006 11:39:44 +0000 (11:39 +0000)
commitcbe660ad9eef604a498caefa1146cbfdcadad3c3
tree9b62a76eabfc28de66c433184fb953c358b063d1
parent067b1c71f57fabc6c8abba4cc2e3420637b06228
parenteb79f18a31b65ba137cfaeb7e121e134b2b20d87
Merge ... '31da046f926a473ba6aab3543102759603fa6db9'
     and '7fe7f8c6e5643a6104c91a6a3c5869d483a193aa'