merge of '13a2fd4a576e4ad16ad4a7365dddd911d1a008c9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 24 Aug 2007 13:56:03 +0000 (13:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 24 Aug 2007 13:56:03 +0000 (13:56 +0000)
commitb2b945413db8d1a00bb61a9944fdcd5920d0f282
tree90d019d0ec02a568f7879a5d3daf4eb2d7c3d8a6
parent778724cb7918c3cda2a2d23610a51dba58e7b6ba
parent77613beb09608ba214db174b0c589924acf30c7e
Merge ... '13a2fd4a576e4ad16ad4a7365dddd911d1a008c9'
     and '1df70c8f4e39ea30b3a0d2231271e7883161ff19'