working on old repo, merging recent changesets.
authorAurélien Aptel <aurelien.aptel@gmail.com>
Fri, 16 Sep 2011 16:24:13 +0000 (18:24 +0200)
committerAurélien Aptel <aurelien.aptel@gmail.com>
Fri, 16 Sep 2011 16:24:13 +0000 (18:24 +0200)
1  2 
st.c

diff --cc st.c
Simple merge