merge of '914da41cd2443e235ef11802d112b1bf24220639'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Aug 2007 11:52:32 +0000 (11:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Aug 2007 11:52:32 +0000 (11:52 +0000)
     and 'd0274d4f33072ca9b28a7df0196b83a43eab6609'


Trivial merge