merge of '1fa25c4ed2c76f537724929745c0f65656880cc7'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:01:55 +0000 (00:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:01:55 +0000 (00:01 +0000)
commit76167f2c9ece28e73bc66088fd9c7e09357c1ca1
tree4b60e33b2cfccef81d6a18d0dbcb02745481a347
parentf049989653780163ab8dfe5b4c1a76ba3faa3644
parent476819b53497fbc60c0aca0d1fadb155b301c5c6
Merge ... '1fa25c4ed2c76f537724929745c0f65656880cc7'
     and 'afcc206a6c21cda5ace989e895b14a6d341a213e'