backports: refresh patches for next-20130709

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
6 files changed