merge of '042829d9f6fe316741a3bf0b701a9d2c9ae0f632'
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Sep 2007 19:01:28 +0000 (19:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 23 Sep 2007 19:01:28 +0000 (19:01 +0000)
commit6c53746b5d0756a740650a631afb43a3530a6f85
tree85c7ec857a85a454497a48ca8fc9f8389ae0def3
parent5e296f5c5b64bfd292094665b5b643a66d4cd9f6
parent6eaa762269d1e9a7428833af8ed2cc5ac8411b02
Merge ... '042829d9f6fe316741a3bf0b701a9d2c9ae0f632'
     and 'f7bfccc01bfb61f63618a3f4859cc468eef65027'