Alx31/candykat — pull request #1 by Alx31 (2014-10-23 22:31:38+00:00)
Title: update a few things to match slim

Change-Id: Ida30f10770cd5fb3e040ef4dfb29f756eff7f245