merge of '4f55fef36523ba6ae829feec111a2bcd0e9e7088'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 Apr 2008 13:14:46 +0000 (13:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 Apr 2008 13:14:46 +0000 (13:14 +0000)
commit4bfc761321a85432d15828fa3c44632b0bd2cb9a
tree4adea763064755db0962bc9f603618e5037d1069
parentc824911c69a5d973cd8c396eb6a33d2d0bd6ebde
parent689a2631fd97441ec5a5c3b44397760521353352
Merge ... '4f55fef36523ba6ae829feec111a2bcd0e9e7088'
     and 'b96f9f2ce38832413116be9151b3f4213200e5ff'