Squashed commit of the following:

commit 54501f4a8509ff3e7a01036de5ae406511055f10
Author: Chris Hillery <ceej@couchbase.com>
Date:   Wed May 7 00:52:21 2014 -0700

    Branch change #2

    Change-Id: I3dd8f6bd9842c292382625ebf71a5f0c9ad8ed1a

commit fdb18c325edde07f2134ab154c477cf779174e4b
Author: Chris Hillery <ceej@couchbase.com>
Date:   Wed May 7 00:52:13 2014 -0700

    Branch change #1

    Change-Id: I5dec0dc7353ace4bbdc896dd46af1c56bcb56062

Change-Id: If00f5d8098f8e3e8f07e0d21d65c92cafe7b6b43
1 file changed
tree: 9564d6e8fb6275bce5e74e5b52128471208b8ae5
  1. First.txt