merge of '20e69e89a02bb1c12fc542cba8d841fc06509088'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Mar 2007 11:28:28 +0000 (11:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Mar 2007 11:28:28 +0000 (11:28 +0000)
     and 'f452cb1c5095e423f7603c4bce5c63518541aeb0'


Trivial merge