merge of '0a4d4659daacb61a9f99c17aa64908c24e07b67d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 9 Oct 2007 14:16:19 +0000 (14:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 9 Oct 2007 14:16:19 +0000 (14:16 +0000)
     and '16ef7e010f669266539951f43abdc37a983c762a'


Trivial merge