From 99e7d1e1619a116c402aade71d29a767032d6d1d Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Wed, 17 Apr 2013 13:37:19 -0700
Subject: [PATCH] Merge branches 'sunshine' and 'master'