merge of '148cdd86dd3fa957bcac82224ad1babe724fd835'
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 12:34:04 +0000 (12:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 12:34:04 +0000 (12:34 +0000)
commitd63e53dee8dbd8ef795bdaa60685ebfb19800ee8
tree8df3cd2d6b27c0698f535bc5e6f793e6ebcd8ba6
parenteaacd5fc473f5426ceef52428e9f0a56dfb05e42
parent494108e9aa767bb523a1be33977b095780026d67
Merge ... '148cdd86dd3fa957bcac82224ad1babe724fd835'
     and 'e7a356a3b4d3b6c4b75e2e62660084b08603ab51'