merge of '332a00dc550ca182177c40331ae4e05ba59793e0'
authorKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 18:44:33 +0000 (18:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 18:44:33 +0000 (18:44 +0000)
commit87bced1204d1fb7bcca24472722af24f498b18b1
tree83f4e7160a5d90c83a16284e71cf252d962d9c5c
parent8ffeebc9f1014eeb6e00547b61c00e285f504bc1
parent1f5fe77cd071d92cf39f73702a880834863ba654
Merge ... '332a00dc550ca182177c40331ae4e05ba59793e0'
     and 'aa744207a479e8c8226e2ab5eceab4897c4cd863'