merge of '82c93f18c011fcfde6381525fc552545ef51ee0f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 15 Jun 2007 22:01:49 +0000 (22:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 15 Jun 2007 22:01:49 +0000 (22:01 +0000)
commite0d1b12e024693573efebbe5b40361e3cc1898f3
tree167823801d023eb1c07f5b8f5bd86de5510ab14e
parent6e4992abe9167064570aa5b9dbdfe44961fd2002
parentd4dfb6314243ba302da3208143447ade68985661
Merge ... '82c93f18c011fcfde6381525fc552545ef51ee0f'
     and 'dcf5a8a0ff71cf06020e1db14987020b861053d6'