merge of '4287770ea855fb20a7ff1b944f48982f4aab48c9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Aug 2007 13:01:11 +0000 (13:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Aug 2007 13:01:11 +0000 (13:01 +0000)
commitf64e6f6de73bce19dfcd982892a2e138e09514fc
tree4c5a56cacb01c8c51c9c040a13a51000d538d520
parent271da1c3647d997ab75a4f3511ff7a81a09d22e8
parent3f8fa1d18aee05690f6636a4df6e831e99103d8d
Merge ... '4287770ea855fb20a7ff1b944f48982f4aab48c9'
     and 'fd012d756d6df4946900321f427519708a15e866'