tree 3a37274e373e2ead999e07878b623564203d7464
parent 9f8a65704088869ed1b27ec4175d2d9f875ff1f2
parent 54a660f6367f55924e3eb2039b7ced2d67bb489d
author Michael Stroucken <stroucki@apache.org> 1331153916 +0000
committer Michael Stroucken <stroucki@apache.org> 1331153916 +0000

merge from trunk.
util.py: yuck, they changed the calling type for embedded ipython. also ensure we exit after leaving debug shell 


git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/branches/stroucki-stable@1298112 13f79535-47bb-0310-9956-ffa450edef68