merge of '7d82814c0d9a56f422a652519c2811b08560b27e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jun 2008 09:29:13 +0000 (09:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jun 2008 09:29:13 +0000 (09:29 +0000)
     and 'f86fbd2f7f071147d458917a620d3ff66ad3141e'


Trivial merge