sarge upgrade - linux, grub conflict

[Martin Zobel-Helas]

Dear Bastian Blank,

> The attached patch is a port of my original patch to the version in
> sarge.

> diff -u grub-0.95+cvs20040624/debian/changelog grub-0.95+cvs20040624/debian/changelog
> --- grub-0.95+cvs20040624/debian/changelog
> +++ grub-0.95+cvs20040624/debian/changelog
> @@ -1,3 +1,9 @@
> +grub (0.95+cvs20040624-17sarge1) stable; urgency=low
> +
> +  * 
> +
> + -- Bastian Blank <waldi at debian.org>  Fri, 28 Apr 2006 22:41:04 +0200
> +
>  grub (0.95+cvs20040624-17) unstable; urgency=low

could you please include a proper changelog entry? Otherwise we will
reject it from the stable update.

Thanks

Martin