From c1657d890ba004b6afb398d3e88b4431611f95f8 Mon Sep 17 00:00:00 2001
From: Dave Young <dyoung@redhat.com>
Date: Wed, 2 May 2012 10:15:58 +0800
Subject: [PATCH] Merge branch 'master'; commit 'b71fc17' into f17