merge of 'a69bccd956bd985b8ff6256dd396ae3fca013280'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 14:36:55 +0000 (14:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 14:36:55 +0000 (14:36 +0000)
commit4337f518ff1eef5452e10b7ee9f4dc48010048f1
treec52b2363e1ebec0ae2fb51bda7d6ae655c65ab96
parent63e622c9018b86a669dda25afadefef8b169fc05
parent64efb6d640ada9fffcb4c98a1e4ae4f8d2bd0e9c
Merge ... 'a69bccd956bd985b8ff6256dd396ae3fca013280'
     and 'c78f27d17fb88b16f530ee47718fbe6d3cde6d6e'