Every time someone files a bug about collision, I need to ask what package owns the files. Would be really nice to automate this, thanks. ;)
This is implemented in svn r4899.
This has been released in 2.1.2_rc1-r2.