merge of '7479d49ced219e54d9513c70988e30d564115acf'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 12:52:56 +0000 (12:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 12:52:56 +0000 (12:52 +0000)
commit1f19df84ae3493e005818648c362a2a4fd00db40
tree6fce7195de7341ee42bc1a3c2de55f6cdbe826d9
parent61571ed5a6f1aa47b90e3d2b137db0bb70af8ae1
parent803a44a08ee2731390dd2d8859e9f90e7036ae62
Merge ... '7479d49ced219e54d9513c70988e30d564115acf'
     and '8731c6b564934ca2220144e80e23b5d1c809e4d0'