merge of 4fa7f171e4ab9878ada3ea61bf2133d23760f203
authorKoen Kooi <koen@openembedded.org>
Wed, 22 Mar 2006 20:53:08 +0000 (20:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Mar 2006 20:53:08 +0000 (20:53 +0000)
commit7bbb31f371886109d11fb60e05e235b65223d69d
treeca9cd36d7a0ea9dfc3efaf2a4417e60f1bfb1d93
parent935bed1faf7292fdb6cb081ab6df1e0749942a97
parent6687137da9915bddbb43185bf84e197c657afdf1
merge of 4fa7f171e4ab9878ada3ea61bf2133d23760f203
     and d5059d334780525ec675748a3862597b1e5c7c7a