Merge ID based cursors branch.
authorJoshua Roesslein <jroesslein@gmail.com>
Sun, 9 Jun 2013 19:53:09 +0000 (12:53 -0700)
committerJoshua Roesslein <jroesslein@gmail.com>
Sun, 9 Jun 2013 19:53:09 +0000 (12:53 -0700)

Trivial merge