Merge commit 'e5d79fd0da5a0dab8b717062651c2fbd658a4b51'

author Adil Allawi <adil@diwan.com>

Wed, 5 Oct 2011 07:42:54 +0000 (08:42 +0100)

committer Adil Allawi <adil@diwan.com>

Wed, 5 Oct 2011 07:42:54 +0000 (08:42 +0100)
author Adil Allawi <adil@diwan.com>
Wed, 5 Oct 2011 07:42:54 +0000 (08:42 +0100)
committer Adil Allawi <adil@diwan.com>
Wed, 5 Oct 2011 07:42:54 +0000 (08:42 +0100)
diff --cc fonts.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	Adil Allawi <adil@diwan.com>
	Wed, 5 Oct 2011 07:42:54 +0000 (08:42 +0100)
committer	Adil Allawi <adil@diwan.com>
	Wed, 5 Oct 2011 07:42:54 +0000 (08:42 +0100)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history