Merge branch 'dev_tests_using_scons'
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Wed, 11 Sep 2013 13:13:19 +0000 (16:13 +0300)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Wed, 11 Sep 2013 13:13:19 +0000 (16:13 +0300)

Trivial merge