Merge branch 'doubletree'
authorTravis Swicegood <development@domain51.com>
Mon, 22 Aug 2011 14:29:35 +0000 (09:29 -0500)
committerTravis Swicegood <development@domain51.com>
Mon, 22 Aug 2011 14:29:35 +0000 (09:29 -0500)

Trivial merge