merge of '5ed39543fd08e1e8104ea222e307798781b5e351'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Aug 2007 11:44:46 +0000 (11:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Aug 2007 11:44:46 +0000 (11:44 +0000)
     and 'c332c982f8fa3ab69315e4dff282b7530ca2737e'


Trivial merge