Merge commit '86ba51d2c17219b82b977da0a912e05a3d9bf858' into stable, which was:
authorIan Beckwith <ianb@erislabs.net>
Sun, 4 Jul 2010 01:16:33 +0000 (02:16 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 4 Jul 2010 01:16:33 +0000 (02:16 +0100)
> commit 86ba51d2c17219b82b977da0a912e05a3d9bf858
> Author: Richard Lloyd <richard.lloyd@connectinternetsolutions.com>
> Date:   Sun Jun 20 13:31:40 2010 +0200
>    stdio.in.h: fix compilation failure when using HP-UX 11's C compiler


Trivial merge