merge of '288863eb61389cf9c42b3101a9e8cd27ebcd129a'
authorKoen Kooi <koen@openembedded.org>
Sun, 21 Oct 2007 15:18:45 +0000 (15:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 21 Oct 2007 15:18:45 +0000 (15:18 +0000)
commitf7b92b8ac9721b554eb93c4c3fd7d2e787a8116a
treedc657f537ba37f24ba7a4251273ebb1b91bb47f1
parentea08aa3e5f248c4d0e682075897db939b0477d8f
parent177bd01e19470dc09d82661e07f87514788088fa
Merge ... '288863eb61389cf9c42b3101a9e8cd27ebcd129a'
     and 'f8424d0fef190f772371b3b3691233dbdd5e7b58'