merge of '45ed69e5efc5ba31b80dc1e00747aeb58424e6c1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Mar 2007 17:20:38 +0000 (17:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Mar 2007 17:20:38 +0000 (17:20 +0000)
commitc72e871b23455c2e2aec864ebb46976b943e73f3
tree988285733be23a32be8f5c1c255c1a2c2e1378e8
parentbfdba7f2444913404db171124f76616cb5da933d
parentd4de519438094201014033bf13d43d7db6713d78
Merge ... '45ed69e5efc5ba31b80dc1e00747aeb58424e6c1'
     and '6b37af53d60c6d9e3798ab204b051841dd3291de'