merge of '0639bf215ed95b383ca3a8350a92186db74d524c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 19 Aug 2007 06:35:06 +0000 (06:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 19 Aug 2007 06:35:06 +0000 (06:35 +0000)
     and '748f0b4080c69e5c9af7c58036128de6d3b29c83'


Trivial merge