Checked merge conflicts
Tobias Leich [Wed, 4 Nov 2009 21:17:35 +0000 (22:17 +0100)]
1  2 
t/core_events.t

diff --cc t/core_events.t
Simple merge