[MERGE] Make -Dpack not cause a error trying to use an unkown variable.

[Robert Collins]

Robert Collins has voted approve.
Status is now: Approved


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C1204480348.16306.22.camel%40flash%3E