merge of '3fe173adf79372b5e29f63215a462e3f7cfdff08'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 May 2007 09:01:29 +0000 (09:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 May 2007 09:01:29 +0000 (09:01 +0000)
commitb5861b703edbf936d8e181e524e20fd856b356a7
treebe3d35c02b9a7f334e6603042590d730037a225d
parent9601e1907e1f69bcb43c630082b5d2262926a380
parenta2e65dd07aec97398476b35e86bc6ad4530eb6d7
Merge ... '3fe173adf79372b5e29f63215a462e3f7cfdff08'
     and 'ceff31fcddbcbfcc34f98821f69f52fdce03e812'