merge of '2d6f350b08c302c3549a0fc0c9151fc2020a6ca0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Oct 2007 19:01:23 +0000 (19:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Oct 2007 19:01:23 +0000 (19:01 +0000)
     and '411624e6069d2de235b76b2702c93f0b340dc064'


Trivial merge