merge of 'd6b23e81759fb2972944b275544f4969ce3412cc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 09:27:35 +0000 (09:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 09:27:35 +0000 (09:27 +0000)
commit4750d648ce629714701b2c264bc56777b7120dfe
treec2cecffb9fe5c86bbf5a39e11ecbe58a62ca8599
parent12c43c6956e951398ea66d2a73d8c1163a3c4f02
parent680843ec6547b952cd1af8686abb6a5f38349e3b
Merge ... 'd6b23e81759fb2972944b275544f4969ce3412cc'
     and 'f9a3a066f3fa746520eb3fded9016d4f30951937'