merge of '5825a3b31a4da8bd899bac6fef5c9f16e34dc883'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 11:16:04 +0000 (11:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 11:16:04 +0000 (11:16 +0000)
commitcbdccd40595f14780870984264ac99275d699870
tree90bf3458b976076187e94c94cdf0eaad01ab6f4c
parent2967320bfaaa7f218cd72f498c10267d6465769a
parentf474a60af4f1a95630d6ac4b3ef2195b932228c7
Merge ... '5825a3b31a4da8bd899bac6fef5c9f16e34dc883'
     and '8d78f48d5027db6d0772303acb59044c4fbcfdbb'