merge of '4fa4f87979de4219c88fba63ac6ae11b020aeced'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 15 Apr 2007 13:01:30 +0000 (13:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 15 Apr 2007 13:01:30 +0000 (13:01 +0000)
     and '9f6fbbb5245b3e296c86950b2208386df7b36ffc'


Trivial merge