merge of '6ff9d848f46715bdb745a274b6611f75395b0755'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Feb 2007 17:16:39 +0000 (17:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Feb 2007 17:16:39 +0000 (17:16 +0000)
     and 'b5baf49fc7cdce9f5faaa2e3303b691a5a10b339'


Trivial merge