merge of '5dac0e1b5f9f45a441a326fa1473ba5075ccaa72'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:14:48 +0000 (11:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:14:48 +0000 (11:14 +0000)
commit486e00ccba909a4d06d7fad616710523bb86188b
tree8ccbbe90d2b0cbd773f79cc1e977b586ae3982d9
parentedc830cc5f0c07ba413f1a878901a9a9441a4397
parentbeb966d9a6865a7d6539f8b9f965247dc560c003
Merge ... '5dac0e1b5f9f45a441a326fa1473ba5075ccaa72'
     and 'a3e33233c551ea93b6c29d959a2a0f5d905b97e5'