merge of '1ae309a70c139143a4704b5def248a5be0b1a810'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 22:41:15 +0000 (22:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 22:41:15 +0000 (22:41 +0000)
     and '327945003e321bca077ca44f526f2f0463ff8277'


Trivial merge