merge of '0303d4291ff3297fae792050c054f118512fd08d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 5 Mar 2007 18:27:05 +0000 (18:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 5 Mar 2007 18:27:05 +0000 (18:27 +0000)
     and 'e0d98822d68dfa24d26f2402a78adb2cb0e219c3'


Trivial merge