merge of '0f6914ddb71c4af09ef7eaffe37c3c74c50c60b7'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 13:41:39 +0000 (13:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 13:41:39 +0000 (13:41 +0000)
commit4ce3a656d2c65c120454150c87965e731612733a
tree37cff9db11a928aa2e656b18bad160d9622d586e
parent6e85438a095b910628a7ce06cdb0a9a08cf894e5
parented03ff0e14485d9ce3cc117ea2f1a9921c5234b3
Merge ... '0f6914ddb71c4af09ef7eaffe37c3c74c50c60b7'
     and '824441f3a8e403dd32a1171069630d10f7b8d4d1'