[experimental-ims] e1406a8 Resolves conflict between 90b7074b4cad090743f5a9797007ab448fa95a39 (fix #941) and experimental-ims experimental-ims needs left- and right-side macros/functions for updating timeouts in cache_vrt_var.c since stale_obj is read-only

[Geoff Simmons]

commit e1406a833de77d1088ea596c57749ebf4ad5a47b
Merge: ff52bbd cd23977
Author: Geoff Simmons <geoff at uplex.de>
Date:   Fri Jul 8 11:43:54 2011 +0200

    Resolves conflict between 90b7074b4cad090743f5a9797007ab448fa95a39 (fix #941) and experimental-ims
    experimental-ims needs left- and right-side macros/functions for updating timeouts in cache_vrt_var.c
    since stale_obj is read-only
    
    Conflicts:
    	bin/varnishd/cache_vrt_var.c