ref: d2ff1d7aaa268496009796ffa4bdfabc93b2dea4
parent: 0b36af8da526ef1389d2c08bb61d6ea5fdb41f2e
parent: 9152664ca51e2c870ed89ba3c81473847c1705db
author: yenatch <[email protected]>
date: Fri Aug 30 12:41:35 EDT 2013
Merge remote-tracking branch 'kanzure/master'