merge of '56ab51a0342466f50234f11f4d4685b642943d6a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Oct 2008 01:38:21 +0000 (01:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Oct 2008 01:38:21 +0000 (01:38 +0000)
     and 'd247017786a0b1f7180e909014da50635ba53f26'


Trivial merge