Merging in gearman-0.2