Merge branch 'master' into xkb

Conflicts:
	config.make.in
	configure.in

1 files changed, 1 insertions, 1 deletions

diff --git a/isofs/rr.c b/isofs/rr.c
index f26d9e42..be4395d6 100644
--- a/isofs/rr.c
+++ b/isofs/rr.c
@@ -505,7 +505,7 @@ rrip_work (struct dirrect *dr, struct rrip_lookup *rr,
 		 we got here from the exit point of the function, then
 		 VALID_NM is actually clear. */
 
-	      /* Save these, becuase rrip_work will clear them. */
+	      /* Save these, because rrip_work will clear them. */
 	      savename = (rr->valid & VALID_NM) ? rr->name : 0;
 	      realdir = rr->realdirent;