This review is based on two lectures given at the 2000 TMR school in Torino
(TMR school on contemporary String Theory and Brane Physics, 26 January-2
February 2000, Torino, Italy). We discuss two main themes: (a) Moyal-type d
eformations of gauge theories, as emerging from M-theory and open string th
eories, and (b) the non-commutative geometry of finite groups, with the exp
licit example of Z(2), and its application to Kaluza-Klein gauge theories o
n discrete internal spaces.