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)
     and f54776e08ef20ddb388681d53fa66a089ea326c6


Trivial merge