Commit e42791d0d3e09848da10e2062f5e32d8b52effc7

Guillem Jover 2008-07-12T06:41:10

Move filename related variables to the beginning of the file Switch them to single expanded varibles.