build fixes: v2013.04-rc3 -> v2013.04(HEAD)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>