merge of '0b047574c2795c0058db53e754d56c77c8df3c70'
authorKoen Kooi <koen@openembedded.org>
Sun, 21 Sep 2008 15:29:50 +0000 (15:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 21 Sep 2008 15:29:50 +0000 (15:29 +0000)
commitfdeb4f5fcefc35a64ca38b28df5c6423067e74ef
tree5c5882aac181445204c9431d25e3e4248dc678a3
parenta1e1a2e1738d4f5a9d8ee8f895c2525f1b37edee
parent686ee70c4a3c8dd6a08ad00f7537dc4050e031d9
Merge ... '0b047574c2795c0058db53e754d56c77c8df3c70'
     and '1e290b7acda884903f32c7adb3068923cae172fd'