Merged from trunk 9215:9217

   Merged from trunk 9215:9217

   | 9216    | Replace the current diefunc() and die alias with a single    |
   | zmedico | die() function. The previous arguments to diefunc() weren't  |
   |         | used anyway. The result is that the die message looks better |
   |         | because it doesn't show the alias and all of it's arguments  |
   |         | which are totally irrelevant. (branches/prefix r9212)        |

   | 9217    | We need to implement diefunc() since environment.bz2 files   |
   | zmedico | contain calls to it (due to alias expansion).                |

svn path=/main/branches/prefix/; revision=9219