merge of '1e74798b9d0398ad1f222430066b7d2f395d22a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 1 Jul 2007 08:37:44 +0000 (08:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 1 Jul 2007 08:37:44 +0000 (08:37 +0000)
commit563109bd191f3015c5c65e21a936502285ff2fb6
tree452408749522c962eb565651ebcab35ccca2c731
parentf651ce10164975fd1d8e58cdf21620a209fa9be6
parent2faf3777e268d3355492f48fdb1991248b04583d
Merge ... '1e74798b9d0398ad1f222430066b7d2f395d22a1'
     and '593f40ffdb7c1f5127d02f4eb4a64463c9a6ae5e'