merge of '6b7b8a54d7265a7382da09d8df6a830b3be30fc4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 13:36:31 +0000 (13:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 13:36:31 +0000 (13:36 +0000)
commit96247505abe090eb267226156d9e06a5c2e12192
tree91dd621835eead1af4efb0f96b386f40cbdcc1dc
parent1dca2db7882a54e81cbdbc2d484aaa1a6008de24
parent409b3bf0ba1f5f911e028b0e6c00f5ac8f31247b
Merge ... '6b7b8a54d7265a7382da09d8df6a830b3be30fc4'
     and '9ca4252efb9948ce173f616c937012398a0b2c42'