merge of 'ddc1435bf9be5344c25c778b1bc2d6af4d04448b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 10:19:19 +0000 (10:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 10:19:19 +0000 (10:19 +0000)
commitc8f31007fac82944cc5569c63734985f684ae09c
treef55ea85061b521e3fc96b9f9e60e58b5b28988d1
parente5b35d6807d71c56135df1ed405731992f9c3150
parenteeb31e6be2e3e29cdb9e3d86d9fb039443880008
Merge ... 'ddc1435bf9be5344c25c778b1bc2d6af4d04448b'
     and 'f6f04acc928b89f8740f4f2ef14b479a36781bc5'