# HG changeset patch
# User Michael Goffioul <michael.goffioul@gmail.com>
# Date 1361458651 0
# Node ID c75939cb6254833830cdbeaf84e666360a34ccf1
# Parent  ec15ef10261d31248abf07ad79da09c8b677c1c5# Parent  0eef0a2a05e22ac8ef2aad06dda200f7def83396
merge with default branch

diff --git a/ChangeLog b/ChangeLog
diff --git a/lib/unistd.in.h b/lib/unistd.in.h