merge of 'b23b7ec5ae17c5427c3d0eb77a11c96d73c53b44'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Jan 2007 23:32:11 +0000 (23:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Jan 2007 23:32:11 +0000 (23:32 +0000)
     and 'ee9553b7958df8396e9de285a3a823f5fe39d8af'


Trivial merge