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)
commita56a90d60d306f7a201544a1d3dc086553f823b0
tree24e60e8bd63f6f16911dd637b45ce318c34a2ea0
parent283c1328b3ebdd4814870f829ac3c88c13e0d06c
parentb5dc7a5067bcf389f09a27180a56c3482c690b61
Merge ... '3a6b4696678a9d7415cda888f0ffc2f453699f4e'
     and 'e63f37ff4cbdbec3709e87ce0d310055fe54fdfc'