* .bzrignore: Remove nonexistent grub-pbkdf2.

diff --git a/.bzrignore b/.bzrignore
index 0cbb3f17f14cb4aba6b950f4db952e3e155e5799..a3e6f9dd20bbd425d528478649259a0032367ab5 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -44,7 +44,6 @@ grub-kbdcomp
 grub-macho2img
 grub-menulst2cfg
 grub-mk*
-grub-pbkdf2
 grub-pe2elf
 grub-probe
 grub_probe_init.c

diff --git a/ChangeLog b/ChangeLog
index 8c39f7ba57b2b876cbdfacb2dd9ffd0f35e49179..a2d11d828d12f2a0fcc8b13a024f83afd33e37fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-17  Colin Watson  <cjwatson@ubuntu.com>
+
+       * .bzrignore: Remove nonexistent grub-pbkdf2.
+
 2011-01-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * configure.ac: Bump version to 1.99~rc1.