merge of '218274d3d618ee5de9be9d8d43abfc279f552139'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jun 2008 16:34:56 +0000 (16:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jun 2008 16:34:56 +0000 (16:34 +0000)
commit6c220ebea3e567aa94cdf41fa309ebdcd4e32dbd
tree8fdb2b3490ed5cf8e18cc4e10c04fd1157825a07
parent882473c9913cf09da1f8e89738cb859e1e8bd882
parent068ac1524d7ac8aebab84978317d363040b15b86
Merge ... '218274d3d618ee5de9be9d8d43abfc279f552139'
     and '8eb2a350085e36627bc9a432834ecae61c94ac82'