Merged from trunk -r15465:15470
| 15466 | Splid deprecated functions into a _deprecated module. |
| zmedico | |
| 15467 | Fix broken dep_expand import from previous commit. |
| zmedico | |
| 15468 | Move merge and unmerge functions to the vartree module. |
| zmedico | |
| 15469 | Move getvirtuals to _deprecated module. |
| zmedico | |
| 15470 | Eliminate the PhaseCheck constructor and make |
| zmedico | PhaseCheck.phases_re a class attribute. Thanks to Sebastian |
| | Pipping <sping@g.o> for the initial patch. |
svn path=/main/branches/prefix/; revision=15484