merge of 'c1a6bbd234dac78ecd896a3addf55c41902cacde'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Aug 2007 14:32:27 +0000 (14:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Aug 2007 14:32:27 +0000 (14:32 +0000)
     and 'e5d7ecec88debbf03a577850945143877b777c6a'


Trivial merge