merge of 'af4511b13e8cbd8513fd3d5de1d714c59d17fa8c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 7 Jan 2008 16:19:05 +0000 (16:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 7 Jan 2008 16:19:05 +0000 (16:19 +0000)
     and 'c5064c11a779b0221a750ff7350a339c75859576'


Trivial merge