tree 0e6687748ff2bda6a4226c9120417053da98ba55
parent d928dad8c8f90e764495cdb08d42596037c22647
author Mary Anthony <mary@docker.com> 1429209229 -0700
committer Jessica Frazelle <princess@docker.com> 1429209479 -0700

for 1.6

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit f44aa3b1fbe5e042fee0fb78507ebac35eca3d04)