merge of '5353be39ab2ea320be019c163381f5d3e4cadc2b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 15:20:57 +0000 (15:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 15:20:57 +0000 (15:20 +0000)
     and '773bfc8eb4142f3291c08d0ea2f313be1f93d7a4'


Trivial merge