Merge remote branch 'jrmuizel/master'
authorBehdad Esfahbod <behdad@behdad.org>
Tue, 4 May 2010 02:46:52 +0000 (22:46 -0400)
committerBehdad Esfahbod <behdad@behdad.org>
Tue, 4 May 2010 02:46:52 +0000 (22:46 -0400)
1  2 
src/hb-open-file-private.hh
src/hb-open-type-private.hh

Simple merge
Simple merge