merge of '628180938514d90c01db3867703717734d7d5d30'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Nov 2007 20:29:02 +0000 (20:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Nov 2007 20:29:02 +0000 (20:29 +0000)
     and '6392b041c5ea8ff7227964369df13245ce5d50bf'


Trivial merge