merge of '35958473cb3e7c22ae3b948f47dcd57d676d22a0'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Oct 2007 09:40:27 +0000 (09:40 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Oct 2007 09:40:27 +0000 (09:40 +0000)
commit2829956ca475be64def70baa8e50333e0737bac4
tree43df8262bcc63aeb8778b63bef256ab044cc2e0d
parentc3277206846720b61c1ac597244ac06d345853b3
parent206c0e46891163d72b02bc9365ba1770c03ff942
Merge ... '35958473cb3e7c22ae3b948f47dcd57d676d22a0'
     and 'dd9786d58f303cdd2d0ff136859e41e1b6558b66'