* merge from the mvo branch

1 files changed, 2 insertions, 2 deletions

diff --git a/methods/http.cc b/methods/http.cc
index d4e231fbe..26d435dea 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -368,8 +368,8 @@ bool ServerState::Close()
 									/*}}}*/
 // ServerState::RunHeaders - Get the headers before the data		/*{{{*/
 // ---------------------------------------------------------------------
-/* Returns 0 if things are OK, 1 if an IO error occursed and 2 if a header
-   parse error occured */
+/* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header
+   parse error occurred */
 int ServerState::RunHeaders()
 {
    State = Header;