merge of 'a32f961c13d10e74ded721ccb9fe83cf7ca3af41'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 7 Aug 2007 13:08:18 +0000 (13:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 7 Aug 2007 13:08:18 +0000 (13:08 +0000)
commit18f81c8e363ed9994c83f2ab0a09766393fd5ed3
tree3afb48d044b682a91bb80b158d5573069501d1ad
parent421cc091c80c58533fe4c02c9d9ef387a2776b49
parentdbee952f8a413008e541fe8907aaea42df28d97f
Merge ... 'a32f961c13d10e74ded721ccb9fe83cf7ca3af41'
     and 'a8f105d480857c488d8c43e2bcd2a1618c0040fa'