I spend time at a couple of different universities quite frequently. The CS departments are focusing and still trying to get a grasp on Quantum Computing. Not sure if that is where things are going though, it's just my anecdotal observations
http://plato.stanford.edu/entries/qt-quantcomp/