merge of '6ca0327eb664414f4653bb5a14758c9b8138fcff'
authorKoen Kooi <koen@openembedded.org>
Sat, 24 Mar 2007 17:37:22 +0000 (17:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 24 Mar 2007 17:37:22 +0000 (17:37 +0000)
commitc28b59d4bfaba12056b3e6f5c1ae39cabdf958df
treec5713d230548209f9144ec3a3262e48c6db84ff5
parentb7b2f07b086e749e7cd6aae62f862d5a0f7452a4
parent4c83c9f064e16f78e6ab01e874a0dcea541856a1
Merge ... '6ca0327eb664414f4653bb5a14758c9b8138fcff'
     and 'a86f58519a8606f6e3391ba31cc52760ef709b6d'