merge of '79480b22471a1e33c199dca94abfa313f4bd0127'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 12:06:30 +0000 (12:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 12:06:30 +0000 (12:06 +0000)
commitaa95de37e18da5a4cdd03207fbe29da1650f6c71
tree0778c353d0cf1b90723c074348a421fdfe44640a
parentcc388e7dbc4634553e2918b31050698fea8e6762
parent73c304554ded0303d3cb410e7a9cfadb77815f5a
Merge ... '79480b22471a1e33c199dca94abfa313f4bd0127'
     and 'ad30a8ff6fed36a655dd5ba0014a93623be4937d'