[Xen-changelog] [xen master] Merge branch 'master' into staging

[patchbot@xxxxxxx]

commit 301fc1499819a4a5e9f5a809271388bec1566872
Merge: aeba23d8f176c4395d8da63e208ade90523f58c7 
d84a6e2fa077d07f91ac72c3d8334b75b45fcba2
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Thu Dec 19 16:34:56 2013 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Thu Dec 19 16:34:56 2013 +0000

    Merge branch 'master' into staging

 Config.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog