12 files changed, 12 insertions, 12 deletions
diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile
index 974c98913..7f911d81c 100644
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@@ -3,7 +3,7 @@
 #
 #   Copyright (C) 2011 Uros Platise. All rights reserved.
 #   Author: Uros Platise <uros.platise@isotel.eu>
-#           Gregory Nutt <spudmonkey@racsa.co.cr>
+#           Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/apps/system/free/README.txt b/apps/system/free/README.txt
index dd92a94ae..1c2d380d4 100644
--- a/apps/system/free/README.txt
+++ b/apps/system/free/README.txt
@@ -2,5 +2,5 @@
 This application provides UNIX style memory free information.
 
 	Source: NuttX
-	Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+	Author: Gregory Nutt <gnutt@nuttx.org>
 	Date: 17. March 2011
diff --git a/apps/system/free/free.c b/apps/system/free/free.c
index 2f61a1dae..3d9698ecb 100644
--- a/apps/system/free/free.c
+++ b/apps/system/free/free.c
@@ -2,7 +2,7 @@
  * apps/system/free/free.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/i2c/i2c_bus.c b/apps/system/i2c/i2c_bus.c
index 07e6d2da3..a684166ff 100644
--- a/apps/system/i2c/i2c_bus.c
+++ b/apps/system/i2c/i2c_bus.c
@@ -2,7 +2,7 @@
  * apps/system/i2c/i2c_bus.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/i2c/i2c_common.c b/apps/system/i2c/i2c_common.c
index e7b27693a..4af648c7d 100644
--- a/apps/system/i2c/i2c_common.c
+++ b/apps/system/i2c/i2c_common.c
@@ -2,7 +2,7 @@
  * apps/system/i2c/i2c_common.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/i2c/i2c_dev.c b/apps/system/i2c/i2c_dev.c
index f2b5a0e21..3d0480a15 100644
--- a/apps/system/i2c/i2c_dev.c
+++ b/apps/system/i2c/i2c_dev.c
@@ -2,7 +2,7 @@
  * apps/system/i2c/i2c_dev.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/i2c/i2c_get.c b/apps/system/i2c/i2c_get.c
index 773f2c963..08510af4b 100644
--- a/apps/system/i2c/i2c_get.c
+++ b/apps/system/i2c/i2c_get.c
@@ -2,7 +2,7 @@
  * apps/system/i2c/i2c_get.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/i2c/i2c_main.c b/apps/system/i2c/i2c_main.c
index fbaf677aa..0cf6786cb 100644
--- a/apps/system/i2c/i2c_main.c
+++ b/apps/system/i2c/i2c_main.c
@@ -2,7 +2,7 @@
  * apps/system/i2c/i2c_main.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/i2c/i2c_set.c b/apps/system/i2c/i2c_set.c
index 66fd8c85a..5baf7f835 100644
--- a/apps/system/i2c/i2c_set.c
+++ b/apps/system/i2c/i2c_set.c
@@ -2,7 +2,7 @@
  * apps/system/i2c/i2c_set.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/i2c/i2c_verf.c b/apps/system/i2c/i2c_verf.c
index 0fa34b96e..109e9c4ce 100644
--- a/apps/system/i2c/i2c_verf.c
+++ b/apps/system/i2c/i2c_verf.c
@@ -2,7 +2,7 @@
  * apps/system/i2c/i2c_verf.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/i2c/i2ctool.h b/apps/system/i2c/i2ctool.h
index 9726f0083..4ff26d03e 100644
--- a/apps/system/i2c/i2ctool.h
+++ b/apps/system/i2c/i2ctool.h
@@ -2,7 +2,7 @@
  * apps/system/i2c/i2ctool.h
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile
index 4528ad44e..71d82f34c 100755
--- a/apps/system/install/Makefile
+++ b/apps/system/install/Makefile
@@ -3,7 +3,7 @@
 #
 #   Copyright (C) 2011 Uros Platise. All rights reserved.
 #   Author: Uros Platise <uros.platise@isotel.eu>
-#           Gregory Nutt <spudmonkey@racsa.co.cr>
+#           Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions