merge of '4c92946353f7eca594c80ecf9ca6eda68f9a4b1d'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 10:59:30 +0000 (10:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 10:59:30 +0000 (10:59 +0000)
commit835c87ebfe46cfc49d03fa9c942b39aa85807a08
tree59ac24228340fdf03527980ba89fb16fdcef24d5
parent0e5bbfa8c4c8f41bfcdcf675f3346a25232e95fd
parent84befe819f4f9b39c9b6f7ccd1863c9ecbe600f8
Merge ... '4c92946353f7eca594c80ecf9ca6eda68f9a4b1d'
     and 'd9028008b81ee7dc03222c59a45df67dfe24a09c'