merge of '20692657869f7a733266d5313f4932a7ff336fb4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 25 Aug 2006 10:22:29 +0000 (10:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 25 Aug 2006 10:22:29 +0000 (10:22 +0000)
commit219969bfd684be1d202d581830107b98dd1c9165
treeda3a3a77f2360fd6a38bcce641f6ad980d78d7be
parent18c800d7eca93e36f914679391a8a7961dad4f8b
parenta4d66865597b43a26875dd649bedf0ca25099e8f
Merge ... '20692657869f7a733266d5313f4932a7ff336fb4'
     and 'df229e8fdb521adfc364395363401a190529731c'