merge of '479b064df21386e3f77f93516e86f40c7ea9ccfa'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 20 Nov 2007 21:44:05 +0000 (21:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 20 Nov 2007 21:44:05 +0000 (21:44 +0000)
commit4a69a66f78b10bcff1e8b050ed483797a3db197c
treea8248a9570ceeacf67bdc71b0505493e6c0bf4a8
parent64c96971c6efeef708dce50949415f45219509bf
parenta329540b6e9177b206851f6ab3e7a131d4ddaf91
Merge ... '479b064df21386e3f77f93516e86f40c7ea9ccfa'
     and 'ab14a7f33b13f2205a64293e2f2e29b20e943bf3'