merge of 924ef15fba1f0235d0a67fd6a565e0da0f09389b
authorJustin Patrin <papercrane@gmail.com>
Fri, 10 Feb 2006 15:46:48 +0000 (15:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Feb 2006 15:46:48 +0000 (15:46 +0000)
commit92abf98c2795a7243f202a250071929d5f4576ed
tree97065671d7e0f6737bc6793233279fcb0175adec
parent21e22881ad0bb921d6f2ef04949523ad33a4d345
parentf1ce6e581e05f2a41170a6ffb562104ffb9ed3e0
merge of 924ef15fba1f0235d0a67fd6a565e0da0f09389b
     and f54776e08ef20ddb388681d53fa66a089ea326c6