merge of '16ebba393f07fe129f76b1b807da9bb04a997d5b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Apr 2007 15:56:40 +0000 (15:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Apr 2007 15:56:40 +0000 (15:56 +0000)
commit9a69bc4f498844e84d1311f3c6ca9bd4efdff319
tree645dcd163ababfb16b99b3bd68afad1f4c1be594
parent202930965422412906820c6679db5bd56667005a
parentce169dcc9877bb6204659c7fb31593addc35b67e
Merge ... '16ebba393f07fe129f76b1b807da9bb04a997d5b'
     and '31cd36b1d92e29148911faa9dd34d6873d0a09b2'