Patch for bug 179351: improve variable scoping issues in order to fix a bug causing oddly formatted dependency emails; patch by Teemu Mannermaa <wicked@etlicon.fi> revised slightly by justdave; r=joel; a=justdave.