Merge proposals dependent on lp:~schuster/mysql-proxy/cscope_etc

lp:~schuster/mysql-proxy/cscope_etc has no merge proposals.