merge of '62f049c7930cc7dcd9a1736a717fff802998ca78'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 13:03:59 +0000 (13:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 13:03:59 +0000 (13:03 +0000)
     and 'c58e498fe9feb390a56441e07fec74a56405b6b1'


Trivial merge