merge of '130abdbeeb7888b012bab591e834a85892fad020'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 09:09:02 +0000 (09:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 09:09:02 +0000 (09:09 +0000)
commitde015c94fc188662b83583fd5abde39b39ac56b3
tree1f980ebe846cc4c3820c7f4237cd0df2c2cf7e3b
parenta9a6274dfaf268077ae5431894e45eee49d69238
parenta5d26d4c72caaee0f86382cafd7e7de0832ef2d3
Merge ... '130abdbeeb7888b012bab591e834a85892fad020'
     and '20df2e0797ee668e032dc23a143e59d25756bb2c'