merge of '474680366447a4dab2f989364e5d93df82ff5054'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 4 Aug 2008 12:11:45 +0000 (12:11 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 4 Aug 2008 12:11:45 +0000 (12:11 +0000)
commite9b9dcb7eba432ec60895478ba53eab59cd4b1f4
treea81aa02dacb172048573f053e70a7cf3a7519a00
parent2391a1b4181a449091807e651ad4442e8d6619c5
parent1c5ddc22e0b0c32976d5ae757eaaad24b02cb6b0
Merge ... '474680366447a4dab2f989364e5d93df82ff5054'
     and 'e823514ff8e0cdded7f451b2e7602dea0a0a9fc7'