merge of '95849379549ff4dd11d6dd203053b1bd43f8ab26'
authorKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 12:57:26 +0000 (12:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 12:57:26 +0000 (12:57 +0000)
commitd2f0fe4df7b83ed32b41714bb10b5f0e820ec517
tree10cfa18236a66eaf36755359e17e4a27c278d5e1
parent791e90665936de6b2e33887bc1d55d8fd14ce8d4
parent2c793a59c9e3fc028f52bf35b92b3ec05005bf61
Merge ... '95849379549ff4dd11d6dd203053b1bd43f8ab26'
     and 'fd79f1d31b405d2489723f78bb2e2479e44b0e5b'