Use wireshark (instead of ether) for temp file name prefix.

svn path=/trunk/; revision=27993

1 files changed, 1 insertions, 1 deletions

diff --git a/file.c b/file.c
index 8d7e580b20..a854e8358d 100644
--- a/file.c
+++ b/file.c
@@ -1204,7 +1204,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
     if (out_fd == -1)
       open_err = errno;
   } else {
-    out_fd = create_tempfile(tmpname, sizeof tmpname, "ether");
+    out_fd = create_tempfile(tmpname, sizeof tmpname, "wireshark");
     if (out_fd == -1)
       open_err = errno;
     out_filename = g_strdup(tmpname);