merge of '3dca1a73b62f0ff1be73ca1a304fd542319e323d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 31 Mar 2007 14:56:15 +0000 (14:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 31 Mar 2007 14:56:15 +0000 (14:56 +0000)
     and '90c926734111bd8bb89a763b03491eb3b15b1e96'


Trivial merge