Merge remote branch 'martin/master'
authorBehdad Esfahbod <behdad@behdad.org>
Mon, 24 May 2010 17:14:24 +0000 (18:14 +0100)
committerBehdad Esfahbod <behdad@behdad.org>
Mon, 24 May 2010 17:14:24 +0000 (18:14 +0100)
1  2 
src/hb-ot-shape.cc

Simple merge