hal: Branch 'master' - 2 commits

[Richard Hughes]

On Sun, 2006-09-10 at 14:28 -0700, David Zeuthen wrote:
>  <!-- ##### USER_FUNCTION HalDeviceAsyncCallback ##### -->
>  <para>
> diff --git a/doc/api/tmpl/hald_runner.sgml
> b/doc/api/tmpl/hald_runner.sgml
> index 70ff5ff..9537d0a 100644
> --- a/doc/api/tmpl/hald_runner.sgml
> +++ b/doc/api/tmpl/hald_runner.sgml
> @@ -81,6 +81,9 @@ hald_runner
>  @device: 
>  @command_line: 
>  @extra_env: 
> + at cb: 
> + at data1: 
> + at data2: 
>  @Returns: 

Do the sgml files *have* to be in git? Every time I re-autogen I get
conflicts against head due to slightly different versions of stuff.

Richard.