merge of '664a6edefbdc237d33ecb5555c53364c94da06d5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 May 2007 20:59:46 +0000 (20:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 May 2007 20:59:46 +0000 (20:59 +0000)
     and 'a5932aea0c67a7f7345cdc9f23bb681da8b33cfe'


Trivial merge