Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu

1 files changed, 1 insertions, 1 deletions

diff --git a/src/profiler.c b/src/profiler.c
index ff97fe88b7b..919aabc92af 100644
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -384,7 +384,7 @@ Return non-nil if the profiler was running.  */)
 DEFUN ("profiler-cpu-running-p",
        Fprofiler_cpu_running_p, Sprofiler_cpu_running_p,
        0, 0, 0,
-       doc: /* Return non-nil iff cpu profiler is running.  */)
+       doc: /* Return non-nil if cpu profiler is running.  */)
   (void)
 {
   return profiler_cpu_running ? Qt : Qnil;