merge of '4326959c5e60e2f30639de951de06bf46a10e335'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 23:29:54 +0000 (23:29 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 23:29:54 +0000 (23:29 +0000)
commitd24eea31873116a6f9095417d2ebd30f1a30b14a
treecb21bdd00bb028b41830796b0ff51657738e4800
parentdae712df08b13536b73b914cee4ebe4ae66e74ae
parente298ab1b12e19c8ae9115a5294f8be97ff6a1b90
Merge ... '4326959c5e60e2f30639de951de06bf46a10e335'
     and 'e40db82fe5785a6b7427f050901caa4bf1fc691f'