merge of 'a1cb25296413fab486698a312f9422fd8e6b9342'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:35:09 +0000 (15:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:35:09 +0000 (15:35 +0000)
     and 'c252dde625fb682071e942d170c75c354060974b'


Trivial merge