From: LaMont Jones <lamont@debian.org>
Date: Wed, 3 Feb 2010 23:26:41 +0000 (-0700)
Subject: Merge remote branch 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bd3ccad2133d3aefdc2caeb3034c0725414d2e9;p=util-linux

Merge remote branch 'origin/master'

Conflicts:
	tests/ts/blkid/images-fs/adaptec-raid.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2
	tests/ts/blkid/images-fs/gfs2.img.bz2
	tests/ts/blkid/images-fs/hpt37x-raid.img.bz2
	tests/ts/blkid/images-fs/isw-raid.img.bz2
	tests/ts/blkid/images-fs/jbd.img.bz2
	tests/ts/blkid/images-fs/jmicron-raid.img.bz2
	tests/ts/blkid/images-fs/lvm2.img.bz2
	tests/ts/blkid/images-fs/nvidia-raid.img.bz2
	tests/ts/blkid/images-fs/ocfs2.img.bz2
	tests/ts/blkid/images-fs/promise-raid.img.bz2
	tests/ts/blkid/images-fs/reiser4.img.bz2
	tests/ts/blkid/images-fs/romfs.img.bz2
	tests/ts/blkid/images-fs/silicon-raid.img.bz2
	tests/ts/blkid/images-fs/swap0.img.bz2
	tests/ts/blkid/images-fs/swap1.img.bz2
	tests/ts/blkid/images-fs/via-raid.img.bz2
	tests/ts/blkid/images-fs/vmfs_volume.img.bz2
	tests/ts/blkid/images-fs/zfs.img.bz2
---

2bd3ccad2133d3aefdc2caeb3034c0725414d2e9
diff --cc .gitignore
index 5c872c2f,a845cf2e..f2f7f51a
--- a/.gitignore
+++ b/.gitignore
@@@ -49,6 -49,3 +49,7 @@@ libtoo
  
  # GTK_DOC_CHECK depends on gtk-doc.m4
  !m4/gtk-doc.m4
 +
 +# cannot deal with bz2 files
 +tests/ts/blkid/images-fs/*.bz2
++tests/ts/blkid/images-fs/*.bz2