merge of '7479d49ced219e54d9513c70988e30d564115acf'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 12:52:56 +0000 (12:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 12:52:56 +0000 (12:52 +0000)
     and '8731c6b564934ca2220144e80e23b5d1c809e4d0'


Trivial merge