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)
commit78a23dcea5d5b9b124e66afaffcebef37726769c
treedb5d2346ea1ef530819c252574cddb41586c6476
parent33faa169a9e16ff6216f94865d717e4104c6736a
parent8b098e896c62d72deecdefdb29db62343ccec916
Merge ... '1a4455548bddc38a21bde1cbdcb1d0fc7f25b9cc'
     and '73307f34eb6c0e821ead39db55ec63966dbf5c6b'