merge of '0096bd317f3e43db1d530c41ae39d2682a227b51'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Oct 2007 15:06:30 +0000 (15:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Oct 2007 15:06:30 +0000 (15:06 +0000)
commit3fd75f731af8fa57278ce928b3734b0d674d4d9f
tree67f3eef34793bb01d721d4edb8f3bf04af281001
parent56a8d656ef0a457b40c77dc877ff51b707722784
parent4d778ea009d2309bb480492e7519d2f7f4e0b525
Merge ... '0096bd317f3e43db1d530c41ae39d2682a227b51'
     and '0ae58917d460020990b038630d35c74df4f95059'