merge of '3066a734f02184d60ed86216f8356de08970aefe'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Apr 2007 11:56:09 +0000 (11:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 4 Apr 2007 11:56:09 +0000 (11:56 +0000)
     and '89b237f2bb444f1ebbbd18dfa8c97fadd289e6ca'


Trivial merge