Merge branch 'master' into position-notification

author Scott González <scott.gonzalez@gmail.com>

Fri, 20 Apr 2012 15:06:11 +0000 (11:06 -0400)

committer Scott González <scott.gonzalez@gmail.com>

Fri, 20 Apr 2012 15:06:11 +0000 (11:06 -0400)
author Scott González <scott.gonzalez@gmail.com>
Fri, 20 Apr 2012 15:06:11 +0000 (11:06 -0400)
committer Scott González <scott.gonzalez@gmail.com>
Fri, 20 Apr 2012 15:06:11 +0000 (11:06 -0400)
diff --cc tests/unit/position/position_core_within.js
Simple merge
author	Scott González <scott.gonzalez@gmail.com>
	Fri, 20 Apr 2012 15:06:11 +0000 (11:06 -0400)
committer	Scott González <scott.gonzalez@gmail.com>
	Fri, 20 Apr 2012 15:06:11 +0000 (11:06 -0400)