[MRG] Manual merge - enventually done by using --ignore-ancestry and then reverting all (!?) the deleted things it had resurrected.

I used this command: (svn 1.6 can do local merges - woo!)

svn merge --depth=infinity -r 20961:HEAD --ignore-ancestry "/workspace/tiki-trunk" "/workspace/kaltura_integration_two"