Prazzy/rebase-testing-1 — pull request #6 by Prazzy (2012-06-03 20:42:53+00:00)
Title: Br5.3

merge it to master from br5.3