merge of '9e29945dfdbfc2fec2c1df2f2690b9e3a59ae6d0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Apr 2007 20:01:33 +0000 (20:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Apr 2007 20:01:33 +0000 (20:01 +0000)
commit2afe5b4046ac057539cad88f3df03d8685ff0a15
tree78880b1cb3ccc8921de0007ab471c291e0428e48
parent448810d9f975b603c78344d00bb3faa4cc7f02a7
parentf7f9843c498125c0c1235ff3ff9039860e03ef02
Merge ... '9e29945dfdbfc2fec2c1df2f2690b9e3a59ae6d0'
     and 'bb678746461a120f0e199de2782ede836dc1b795'