merge.
authorAurélien Aptel <aurelien.aptel@gmail.com>
Fri, 26 Nov 2010 21:12:54 +0000 (22:12 +0100)
committerAurélien Aptel <aurelien.aptel@gmail.com>
Fri, 26 Nov 2010 21:12:54 +0000 (22:12 +0100)
1  2 
st.c

diff --cc st.c
Simple merge