am 6573f1c7: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 01:02:04 +0000 (18:02 -0700)]
* commit '6573f1c77f56648a40b00ebe323eadafd7cc5157':


Trivial merge