merge of '072966cba710b512bdaeb39992db259a90fb7fdd'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 10 Jan 2007 13:07:00 +0000 (13:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 10 Jan 2007 13:07:00 +0000 (13:07 +0000)
commita9124a4ae662824c69b7e0d6441273d7f513cbc0
treed05ee6c6730a26901920337fb68cc7f21f2613aa
parent066153b36d0e79b391dbe833775346466cbaf595
parent5bbcd1c6647233e8e3ef065a9011320d1b4ceb51
Merge ... '072966cba710b512bdaeb39992db259a90fb7fdd'
     and 'c75b2afa1a69147279b15626fa985f3fcb4f1ce1'