merge of '23a53ef6d8b0bd12c2ad781ad96e32cf88487a76'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Jan 2007 11:50:50 +0000 (11:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Jan 2007 11:50:50 +0000 (11:50 +0000)
     and 'bb4adcc719267cf21949b39dd8d42169fddbc6b3'


Trivial merge