resolve conflicts
resolve conflicts

darcs-hash:20080724180140-a887e-f03bf5d7d5ac02b6388b80fbfbce0caa9e3ba6ca.gz

thjaeger/easystroke,thjaeger/easystroke,RaphaelRochet/easystroke,RaphaelRochet/easystroke