c48bb70ca1c23570469fd2fbff3229e528b76940 a0e03f484c3feda2dde768341ac10b5c813f080f Sylvain Joyeux sylvain.joyeux@m4x.org http://github.com/doudou/roby/commit/d6625a42635f85344859f7c55f26511f145cd8b6 d6625a42635f85344859f7c55f26511f145cd8b6 2009-06-27T08:45:14-07:00 2009-06-25T23:30:39-07:00 Merge commit 'origin/next' into ruby1.9 Conflicts: lib/roby/event.rb lib/roby/propagation.rb lib/roby/relations.rb lib/roby/relations/executed_by.rb lib/roby/relations/hierarchy.rb lib/roby/state/state.rb lib/roby/support.rb lib/roby/task.rb test/relations/test_hierarchy.rb test/suite_core.rb test/test_control.rb test/test_event.rb test/test_exceptions.rb test/test_plan.rb test/test_propagation.rb test/test_relations.rb test/test_support.rb test/test_task.rb 2fafec7c119df2567f277b9468ae360776d18f7c Sylvain Joyeux sylvain.joyeux@m4x.org