merge of '3903211109bcf34b8e6540e6f23ab4860f0236d8'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 07:17:35 +0000 (07:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 07:17:35 +0000 (07:17 +0000)
commitaa55a98a837d301b8cd529ae3b7c041bdecb31dc
treeff51adbb6d1f8679934259544599ba9892e95263
parentb8bf7e6b8135bc0b2ed345488ffd6908a9ce9799
parentde6e70884f1c4c7c0177d48c6e64a02aa3063523
Merge ... '3903211109bcf34b8e6540e6f23ab4860f0236d8'
     and '5aa52a23ca3ba7054d5e294b0347d5f5e02dc077'