v2 restore leak fix

[David Bremner]

Jani Nikula <jani at nikula.org> writes:

> On Mon, 17 Dec 2012, david at tethera.net wrote:
>> This obsoletes 
>>
>>      id:1355688997-19164-1-git-send-email-david at tethera.net
>>
>> Actually the first patch in the series is now an unrelated bug fix, 
>> since it isn't needed anymore for 2 and 3.
>
> The series LGTM.
>
> Jani.

Pushed, with a Tomi approved commit message for patch 2, and one small
fix to patch 1, which used line_ctx before it was defined in a later
patch.

d