merge of '6f5210038562db01ca0770735bbb801e0fa828e1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 1 May 2007 10:05:39 +0000 (10:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 1 May 2007 10:05:39 +0000 (10:05 +0000)
     and '81b965980024f9910b33f96029588e606530aae4'


Trivial merge