merge of 'c676f4c47aca063e35fcb7797289ec8b489f8536'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 19:11:23 +0000 (19:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 19:11:23 +0000 (19:11 +0000)
commit86435978f7d93f5380f19034888b79459d9cc44f
tree58816b427a612ea76ea3b1f715920fb7f53f8d1e
parentd21e9e88061afa6f1a702b9d146506fa7d38cf91
parent65e38b20e278ee596bf5849dc0f031ed1f88d187
Merge ... 'c676f4c47aca063e35fcb7797289ec8b489f8536'
     and 'd32021cb86bdd968e8bbc6eff3f4bebec313978e'