Merge branches 'mark' and 'timeout'

diff --cc src/oping.c
index 5442d60,3ae226c..6263a4d
--- 1/src/oping.c
--- 2/src/oping.c
+++ b/src/oping.c
@@@ -647,7 -647,7 +649,7 @@@ static int read_options (int argc, cha
  
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:m:"
 -              optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:w:"
++              optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:m:w:"
  #if USE_NCURSES
                                "uUg:"
  #endif