Vanilla/Vanilla — pull request #571 by Snaipe (2013-02-08 02:56:06+00:00)
Title: Fix unit tests failure on some configs

Signed-off-by: Snaipe franklinmathieu@gmail.com