Fix some cucumber scenarios (Ruby 1.9/2.0).
Merge branch 'develop' of https://github.com/trema/trema into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.