merge of '3a2d3525d6188443c195ea295aa262c5e3dccb74'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 10:38:55 +0000 (10:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 10:38:55 +0000 (10:38 +0000)
commitd9e8914c75a9b6f3074e9554620aa747b6f0cca6
tree20c973b2bf6ce12bec4c861375e3d1d39830b7a0
parent94d4193e5e34a1909b0c804dc64eeb67642788db
parent9609e2094141c63b7cd211eebcd0f9f1be8806f4
Merge ... '3a2d3525d6188443c195ea295aa262c5e3dccb74'
     and '40fbbc76fa2b3612027b83b97b4e703d113eaa3c'