merge of '53d64b20113c9b23a5d4825ba78e6facd2a1a506'
authorKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 18:19:23 +0000 (18:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 18:19:23 +0000 (18:19 +0000)
commitdabb152c4a2af97620abf527ef79c8f8b591420a
treeedc5e0ccb2ac56d383b0f8e9dc08ed92dffa4861
parent5730a399e4b393861802da84f1417ce840db73c1
parent34e47e40502c1f7fdb2d622e2d33b0899ecf1af5
Merge ... '53d64b20113c9b23a5d4825ba78e6facd2a1a506'
     and 'a28fabd7fe7ef37dfa0b2ed9b500e579b1034bc8'