merge of '130abdbeeb7888b012bab591e834a85892fad020'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 09:09:02 +0000 (09:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 09:09:02 +0000 (09:09 +0000)
     and '20df2e0797ee668e032dc23a143e59d25756bb2c'


Trivial merge