merge of '3447c93047f153922a4e64420c682c7b0d9f6e9a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Mar 2008 13:27:00 +0000 (13:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Mar 2008 13:27:00 +0000 (13:27 +0000)
     and '46a58faaa47f475ec8dd3ab429bba9fc88b7b3a8'


Trivial merge