merge of '4b9bf269fccb2d8469b9d1ccfe6d73ac060a6b29'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Feb 2008 22:15:50 +0000 (22:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Feb 2008 22:15:50 +0000 (22:15 +0000)
     and 'fce7884660951ebd01cb61a963139c631312da95'


Trivial merge