merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:46:14 +0000 (17:46 -0700)]

No differences found