merge of '3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 22:02:21 +0000 (22:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 22:02:21 +0000 (22:02 +0000)
     and 'fa0e8dd852860da362d27938db78954d4c8791ae'


Trivial merge