From 77678f3af1b667b21ee4bf6f62ed233735d68d1a Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Sun, 14 Jul 2013 11:51:50 +0200
Subject: [PATCH] Merge branch 'master' into ide-1.5.x

---
 libraries/SoftwareSerial/keywords.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/SoftwareSerial/keywords.txt b/libraries/SoftwareSerial/keywords.txt
index 3f36dfc..aaea17c 100644
--- a/libraries/SoftwareSerial/keywords.txt
+++ b/libraries/SoftwareSerial/keywords.txt
@@ -1,6 +1,6 @@
 #######################################
 # Syntax Coloring Map for SoftwareSerial
-# (formely NewSoftSerial)
+# (formerly NewSoftSerial)
 #######################################
 
 #######################################