sync tconfig.py with sources in ipython1
Take a version check out of the method call. Thanks to Fernando Perez.
Remove a Unicode character
Added coll.update(kwargs) to hline method; thanks to Daniel Fish
revert changes that cause embedding_in_qt4 to fail
fic bug in traited config: mathtext settings
fixed bug in traited config: text.markup
update traited config for text.markup
added set_extent method to AxesImage
fixed a bug in pyqt4 subplots-adjust
