2008/3/19 Rafael Espindola <espindola@google.com>: > This patch merges everything up to but not including the phiprop > split. I will work on it as soon as this is in. You mean forwprop? What files are you getting merge conflicts on? > OK? If this will make your job easier, sure. Thanks. Diego.