merge of '3a47981fd330163efa2f76ef144ec299e22bfa96'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 24 Apr 2008 12:19:18 +0000 (12:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 24 Apr 2008 12:19:18 +0000 (12:19 +0000)
commit6f5ffc9531471696cbe116c976cf35eff590fbde
tree8e597ac11d13dbb94afa9dd56804264432397e62
parent4a74160ea0cf6777d05f1c3ac12a5310d0483a88
parent2a1c37753e4f06f1cdf0ffc5e5de70483a9830fb
Merge ... '3a47981fd330163efa2f76ef144ec299e22bfa96'
     and '3afb4ffc02c1e4bde1031645cfa9f8e5465f2138'