merge of '4eb9d3b0c9a35463c247aadd30af658fd1c31fc4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jun 2007 14:39:22 +0000 (14:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jun 2007 14:39:22 +0000 (14:39 +0000)
commit32a81c73f2d14e67d711cb8e740e2efc62225dfd
treea71a295f487f38dff7fa242463bf6ed77f5d7a9f
parentfcdbb1db35bbd3a20e9d25b8499b6a8549b5d26c
parentcb5a149f701dde19bd27ba87f89ca673085b7c6b
Merge ... '4eb9d3b0c9a35463c247aadd30af658fd1c31fc4'
     and 'c8e2ca01dd2daa1dda571be33da5b035bfdb6433'