merge of '44e174b3ce2f7bdec89689f8329e4fe03a345f08'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Dec 2007 12:57:29 +0000 (12:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Dec 2007 12:57:29 +0000 (12:57 +0000)
     and 'b075adcf4c74f28e1d73ec39796adb35c127dcce'


Trivial merge