merge of '318660b8f7240f5e784cdaa0a4b9048cf6216703'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 May 2008 04:42:19 +0000 (04:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 May 2008 04:42:19 +0000 (04:42 +0000)
commitabd25c0dce4a42a778f31cb7a560d3fc25e5f083
tree7a86be059ade5fdb9737f2bf1c54fe3e8c611723
parentdb7749c30b3890990b48ef9c52b1d479d86966b0
parent02a398b48e62e386ffdfad36af1c21cca34ae475
Merge ... '318660b8f7240f5e784cdaa0a4b9048cf6216703'
     and '9a7b1dbe287eb9e4b90026bdaca80bbeaeef126b'