merge of '6d161d4303314c43fd7d0d04ac9394cb58e8d2bc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Dec 2007 15:23:39 +0000 (15:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Dec 2007 15:23:39 +0000 (15:23 +0000)
     and '754f491e90085be59caba57db33c41de63535015'


Trivial merge