Arun Isaac <arunisaac@systemreboot.net> writes:

>> We don't rebase 'live' branches.  The best way is to merge master, or
>> you could cherry-pick the patches.  I can merge it later if you're not
>> comfortable doing it :-)
>
> Yes, it would be best if you handle this. I am quite sleep deprived, and
> might do something stupid. :-P

Merged!