merge of '069cb75cc86b7dc6009c903b63cddcb884858210'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 16 Feb 2007 10:31:11 +0000 (10:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 16 Feb 2007 10:31:11 +0000 (10:31 +0000)
commita16af27bc459438516b9c25ae55ec91d0f2cef03
tree6fc66f5cdf8a07e7e5d3de323b3d0646f4b9c19b
parentd351c7db1df1443c4817ef44d9567d14ffcd619a
parent20ba7ff25c634d2d917f93b854ed280a91422d09
Merge ... '069cb75cc86b7dc6009c903b63cddcb884858210'
     and 'b21fcc2294b39029891cdcf3c5efac9106f179e6'