merge of '4303b4d9cd0d95a437c5f351f6c879d2ea8bcd19'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 11:55:04 +0000 (11:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 11:55:04 +0000 (11:55 +0000)
     and 'ac2e88d3491f6e0cbf4f4435316ab9c6eba69fe7'


Trivial merge