Merge from head

15 files changed, 17 insertions, 17 deletions

diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index 121aec88e627..3def9d07dbdc 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h
index 73595238b216..93098f370e0c 100644
--- a/usr.bin/sort/bwstring.h
+++ b/usr.bin/sort/bwstring.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index a619fcfda016..b3c80f64b3e8 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/coll.h b/usr.bin/sort/coll.h
index a3ceaafd8b04..929974267041 100644
--- a/usr.bin/sort/coll.h
+++ b/usr.bin/sort/coll.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index 2d185e4a4809..d989008dcc29 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h
index 8e95fdb3371d..ae33a2a7e9d3 100644
--- a/usr.bin/sort/file.h
+++ b/usr.bin/sort/file.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/mem.c b/usr.bin/sort/mem.c
index 999aea2b0060..93cb019646f6 100644
--- a/usr.bin/sort/mem.c
+++ b/usr.bin/sort/mem.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/mem.h b/usr.bin/sort/mem.h
index 13ba4a9aa7a6..44eb5449a1d3 100644
--- a/usr.bin/sort/mem.h
+++ b/usr.bin/sort/mem.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c
index b370723552cf..fde2b6f88623 100644
--- a/usr.bin/sort/radixsort.c
+++ b/usr.bin/sort/radixsort.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/usr.bin/sort/radixsort.h b/usr.bin/sort/radixsort.h
index 5276d7162c59..ff881a3f8d1f 100644
--- a/usr.bin/sort/radixsort.h
+++ b/usr.bin/sort/radixsort.h
@@ -1,7 +1,7 @@
 /*	$FreeBSD$	*/
 
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/usr.bin/sort/sort.1.in b/usr.bin/sort/sort.1.in
index 6dd765772fbb..887621f2c5e1 100644
--- a/usr.bin/sort/sort.1.in
+++ b/usr.bin/sort/sort.1.in
@@ -612,7 +612,7 @@ command first appeared in
 .Sh AUTHORS
 Gabor Kovesdan <gabor@FreeBSD.org>,
 .Pp
-Oleg Moskalenko <oleg.moskalenko@citrix.com>
+Oleg Moskalenko <mom040267@gmail.com>
 .Sh NOTES
 This implementation of
 .Nm
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 7e0ab6914b4d..d811a868bc6c 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h
index a37f92280f39..e339ff729b25 100644
--- a/usr.bin/sort/sort.h
+++ b/usr.bin/sort/sort.h
@@ -2,7 +2,7 @@
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c
index 593e54c57b54..5d15f9af3696 100644
--- a/usr.bin/sort/vsort.c
+++ b/usr.bin/sort/vsort.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h
index facd075113ee..17f58e59c160 100644
--- a/usr.bin/sort/vsort.h
+++ b/usr.bin/sort/vsort.h
@@ -1,7 +1,7 @@
 /*	$FreeBSD$	*/
 
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko@citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor@FreeBSD.org>
  * All rights reserved.
  *
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(__VSORT_H__)
-#define _VSORT_H__
+#ifndef _VSORT_H_
+#define _VSORT_H_
 
 #include "bwstring.h"