merge of '1a4455548bddc38a21bde1cbdcb1d0fc7f25b9cc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Aug 2008 12:31:10 +0000 (12:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Aug 2008 12:31:10 +0000 (12:31 +0000)
     and '73307f34eb6c0e821ead39db55ec63966dbf5c6b'


Trivial merge