merge of '4c745bba392cfbeb0cf77848b5c125b61d003df4'
authorKoen Kooi <koen@openembedded.org>
Mon, 19 Feb 2007 21:47:04 +0000 (21:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 19 Feb 2007 21:47:04 +0000 (21:47 +0000)
commitf159eb4b635e0460f96eb1202780a2e7275bd3cb
tree5c3c761e031d2ffd13b59abbeae9f10a7708889a
parent3f332d70bfdd23301c69701a0a8004cbeeb75585
parent4b9be0149ce3e44b6a2c0d7fab2d5d8f3bdbf6e7
Merge ... '4c745bba392cfbeb0cf77848b5c125b61d003df4'
     and 'a4676fba67b8fd694663c29eff37d616ac133b40'