merge of '96413855622926bccdbbfe20ecfe75876ce63806'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jul 2007 13:29:49 +0000 (13:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jul 2007 13:29:49 +0000 (13:29 +0000)
     and 'c2b7bf2b98443cd961a60ce5dd26e8d6e01afda2'


Trivial merge