Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	libraries/Ethernet/examples/XivelyClient/XivelyClient.ino
	libraries/Ethernet/examples/XivelyClientString/XivelyClientString.ino
	libraries/GSM/examples/GSMXivelyClient/GSMXivelyClient.ino
	libraries/GSM/examples/GSMXivelyClientString/GSMXivelyClientString.ino
	libraries/Servo/examples/Knob/Knob.ino
	libraries/Servo/examples/Sweep/Sweep.ino
	libraries/WiFi/examples/WiFiXivelyClient/WiFiXivelyClient.ino
	libraries/WiFi/examples/WiFiXivelyClientString/WiFiXivelyClientString.ino

Author: cmaglie

examples/Knob/Knob.ino

@@ -1,5 +1,11 @@
-// Controlling a servo position using a potentiometer (variable resistor)
-// by Michal Rinott <http://people.interaction-ivrea.it/m.rinott>
+/* 
+ Controlling a servo position using a potentiometer (variable resistor) 
+ by Michal Rinott <http://people.interaction-ivrea.it/m.rinott> 
+
+ modified on 8 Nov 2013
+ by Scott Fitzgerald
+ http://arduino.cc/en/Tutorial/Knob
+*/
 
 #include <Servo.h>
 
@@ -13,10 +19,11 @@ void setup()
   myservo.attach(9);  // attaches the servo on pin 9 to the servo object
 }
 
-void loop()
-{
-  val = analogRead(potpin);            // reads the value of the potentiometer (value between 0 and 1023)
-  val = map(val, 0, 1023, 0, 179);     // scale it to use it with the servo (value between 0 and 180)
-  myservo.write(val);                  // sets the servo position according to the scaled value
-  delay(15);                           // waits for the servo to get there
-}
+void loop() 
+{ 
+  val = analogRead(potpin);            // reads the value of the potentiometer (value between 0 and 1023) 
+  val = map(val, 0, 1023, 0, 180);     // scale it to use it with the servo (value between 0 and 180) 
+  myservo.write(val);                  // sets the servo position according to the scaled value 
+  delay(15);                           // waits for the servo to get there 
+} 
+

examples/Sweep/Sweep.ino

@@ -1,31 +1,35 @@
-// Sweep
-// by BARRAGAN <http://barraganstudio.com>
-// This example code is in the public domain.
+/* Sweep
+ by BARRAGAN <http://barraganstudio.com> 
+ This example code is in the public domain.
 
+ modified 8 Nov 2013
+ by Scott Fitzgerald
+ http://arduino.cc/en/Tutorial/Sweep
+*/ 
 
-#include <Servo.h>
+#include <Servo.h> 
+ 
+Servo myservo;  // create servo object to control a servo 
+                // twelve servo objects can be created on most boards
+ 
+int pos = 0;    // variable to store the servo position 
+ 
+void setup() 
+{ 
+  myservo.attach(9);  // attaches the servo on pin 9 to the servo object 
+} 
+ 
+void loop() 
+{ 
+  for(pos = 0; pos <= 180; pos += 1) // goes from 0 degrees to 180 degrees 
+  {                                  // in steps of 1 degree 
+    myservo.write(pos);              // tell servo to go to position in variable 'pos' 
+    delay(15);                       // waits 15ms for the servo to reach the position 
+  } 
+  for(pos = 180; pos>=0; pos-=1)     // goes from 180 degrees to 0 degrees 
+  {                                
+    myservo.write(pos);              // tell servo to go to position in variable 'pos' 
+    delay(15);                       // waits 15ms for the servo to reach the position 
+  } 
+} 
 
-Servo myservo;  // create servo object to control a servo
-// a maximum of eight servo objects can be created
-
-int pos = 0;    // variable to store the servo position
-
-void setup()
-{
-  myservo.attach(9);  // attaches the servo on pin 9 to the servo object
-}
-
-
-void loop()
-{
-  for (pos = 0; pos < 180; pos += 1) // goes from 0 degrees to 180 degrees
-  { // in steps of 1 degree
-    myservo.write(pos);              // tell servo to go to position in variable 'pos'
-    delay(15);                       // waits 15ms for the servo to reach the position
-  }
-  for (pos = 180; pos >= 1; pos -= 1) // goes from 180 degrees to 0 degrees
-  {
-    myservo.write(pos);              // tell servo to go to position in variable 'pos'
-    delay(15);                       // waits 15ms for the servo to reach the position
-  }
-}