merge of 'b52c7469e4fbb93f35ed1de1f3e5225ee9d27d9c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Feb 2008 21:15:03 +0000 (21:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Feb 2008 21:15:03 +0000 (21:15 +0000)
     and 'd0de4044d1bae905c2f30dd83d3f5bab85b3f52d'


Trivial merge