merge of '0db5a631daed7a2002855bd39af92ef174a28037'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Aug 2007 10:14:37 +0000 (10:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Aug 2007 10:14:37 +0000 (10:14 +0000)
     and 'fd42dbc3f52d856f1d5210791ff3fc2be2bc2749'


Trivial merge