[Merge] lp:~jamesodhunt/upstart/bug-1096531 into lp:upstart

[Colin Watson]

Review: Approve

Your future self will probably thank you for separating the nih_assert (foo && bar) into two asserts, so that you can easily see which condition failed.  Otherwise, looks good to me, thanks.
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1096531/+merge/143314
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-1096531 into lp:upstart.