VanillaDev/Vanilla — pull request #327 by Multitallented (2012-10-03 03:22:38+00:00)
Title: Did it right this time hopefully... stupid rebase...

Signed-off-by: Multitallented