Reverted r as it contains several unrelated changes.
The command used was: svn merge -r 13931:13924 .
This commit contains several unrelated changes in /generic_fns/structure/main.py and /prompt/structure.py.
Authored by: han87 2011-07-27
Parent: [r13932]
Child: [r13934]
