merge of '3a72c4b2962d909444aaaee9569be3bb90169577'
authorKoen Kooi <koen@openembedded.org>
Mon, 16 Oct 2006 13:58:07 +0000 (13:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 16 Oct 2006 13:58:07 +0000 (13:58 +0000)
commit00a1aa7d8aa69edfcde4cbb2c96597c1f63e6a43
tree8917adef007f771d78742db1c72dd36dde5a04c3
parentf8e702ad4d191eeb23dc78bd2db3c2ed023aa00e
parent7810352ab397b66e7c4f46bddd09bd68e7a0cadf
Merge ... '3a72c4b2962d909444aaaee9569be3bb90169577'
     and '514b31d89c294ce11810ee76a2138d455216409b'