merge of '3a6b4696678a9d7415cda888f0ffc2f453699f4e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 13 Mar 2007 12:48:16 +0000 (12:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 13 Mar 2007 12:48:16 +0000 (12:48 +0000)
     and 'e63f37ff4cbdbec3709e87ce0d310055fe54fdfc'


Trivial merge