merge of '72708eace9dcdb70c5700231b4f92541bb90b6ac'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 19:17:03 +0000 (19:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 19:17:03 +0000 (19:17 +0000)
     and '91a0ad611226219a56b014a2e89ec3d70647d2eb'


Trivial merge