merge of 'a42936f86bfc2fe328a115dd331286fc71e8156a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Dec 2007 09:33:41 +0000 (09:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Dec 2007 09:33:41 +0000 (09:33 +0000)
     and 'c0e108d768a455005e5b9ad28796112f203c3de6'


Trivial merge