merge of '6f0db148d82d30078ed867182e31679b32d6fe62'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 13:27:57 +0000 (13:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 13:27:57 +0000 (13:27 +0000)
commitc51133644c2ea2b1e75e962ccc6d24cdc107ff1c
treee760429f95e745a66ad67ec29996e516a4867943
parenta9784bef976a1bee8cb58f2422fc6e9055ff8090
parent582c7a75d0b25062783b087ffcc6cd4a3cd86f4c
Merge ... '6f0db148d82d30078ed867182e31679b32d6fe62'
     and '844f33ecedcd7290081e897e5557e7a5b56b5724'