merge of 'ae600945a62c9f75e22c98c2d956b2d6f1d241e2'
authorKoen Kooi <koen@openembedded.org>
Sun, 9 Dec 2007 09:58:33 +0000 (09:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 9 Dec 2007 09:58:33 +0000 (09:58 +0000)
     and 'b1d80102a53f74c55cb0792f31a406f8c6fda540'


Trivial merge