Merge commit 'stable/master' into zygo

author Zygo Blaxell <zblaxell@feedme.hungrycats.org>

Sat, 29 Mar 2008 19:06:01 +0000 (15:06 -0400)

committer Zygo Blaxell <zblaxell@feedme.hungrycats.org>

Sat, 29 Mar 2008 19:06:01 +0000 (15:06 -0400)
author Zygo Blaxell <zblaxell@feedme.hungrycats.org>
Sat, 29 Mar 2008 19:06:01 +0000 (15:06 -0400)
committer Zygo Blaxell <zblaxell@feedme.hungrycats.org>
Sat, 29 Mar 2008 19:06:01 +0000 (15:06 -0400)
diff --cc Makefile

index 2324671c35933a59f6eb7eb25e883ab00cabc35f,254de79dbff5bf87d5a2f4b876079bc9d178b365..ec864146f328e418e7afc51fb4bc6de910968043
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
   VERSION = 2
   PATCHLEVEL = 6
   SUBLEVEL = 24
- EXTRAVERSION = .3-zb5s-toi
- -EXTRAVERSION = .4
++EXTRAVERSION = .4-zb5s-toi
   NAME = Err Metey! A Heury Beelge-a Ret!
   
   # *DOCUMENTATION*
diff --cc fs/fuse/dir.c
Simple merge
author	Zygo Blaxell <zblaxell@feedme.hungrycats.org>
	Sat, 29 Mar 2008 19:06:01 +0000 (15:06 -0400)
committer	Zygo Blaxell <zblaxell@feedme.hungrycats.org>
	Sat, 29 Mar 2008 19:06:01 +0000 (15:06 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
fs/fuse/dir.c	patch \|	diff1 \|	diff2 \|	blob \| history