merging ruby trunk