[Success!] [MERGE] SourceLayout: esi, take 1

[Bundle Buggy]

This change has been merged.
Previous status: Approved
For details, see: 
http://bundlebuggy.aaronbentley.com/project/squid/request/%3C49C00843.7040005%40measurement-factory.com%3E
Project: Squid