merge of 'bb233fef5b7011690cc33565cb45dadb42be30c7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Jul 2008 13:36:13 +0000 (13:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Jul 2008 13:36:13 +0000 (13:36 +0000)
     and 'f22e68740932b52d4128634598e1377947560f47'


Trivial merge