merge of '8a506316a17c249d0b58a6a584e41a5f3920f173'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 14:19:22 +0000 (14:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 14:19:22 +0000 (14:19 +0000)
     and 'c7e63745b6f6d280a7932ebadb8a295d11ec2998'


Trivial merge