merge of '20460ca5bc208d9dfe0693cc79f9684c01aef89d'
authorKoen Kooi <koen@openembedded.org>
Thu, 18 Sep 2008 08:08:13 +0000 (08:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 18 Sep 2008 08:08:13 +0000 (08:08 +0000)
commit4726077de2e910260443e159384f2eede3f10310
tree92a3cbca7dcefadc010e083750b203154aeb55fe
parentf5ddbcbe60b8aada0596de1d0662fe6f76113b57
parent424fe3f5e3fe243cb6dca1927e4a036a726d7c46
Merge ... '20460ca5bc208d9dfe0693cc79f9684c01aef89d'
     and '47719692fbdea0a9908a2b8c86858fe92ce97e1e'