Merge remote-tracking branch 'origin/master' into osx
Merge branch 'master' into osx

Conflicts:
	sample/makefile
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
fixed OSX install scripts
Merge branch 'master' into osx

Conflicts:
	sample/makefile
	sample/xbee1/11.uart_test/makefile
Revert "adjusted sample makefile for OSX"

This reverts commit 018cfb7951a917e5307eb5b16ecf260da8c86428.

Conflicts:

	sample/makefile
fixed buildall so that it can be run from anywhere
we should ONLY be saving the address if this isn't a catchall connection...
build scripts are now more intelligent about using man2html
debug output now indicates how much data was recieved in each packet
Revert "updated sample for use on OSX - use /dev/cu.*"

This reverts commit 99df8de73a5deb136073be191c095490ef0af09b.
updated HISTORY for an old change
Merge branch 'master' into win32