Merge branch 'staging'

author larsk <lars.kurth@citrix.com>

Tue, 27 Nov 2012 15:48:11 +0000 (15:48 +0000)

committer larsk <lars.kurth@citrix.com>

Tue, 27 Nov 2012 15:48:11 +0000 (15:48 +0000)
author larsk <lars.kurth@citrix.com>
Tue, 27 Nov 2012 15:48:11 +0000 (15:48 +0000)
committer larsk <lars.kurth@citrix.com>
Tue, 27 Nov 2012 15:48:11 +0000 (15:48 +0000)
diff --cc xen.org/download/xcp/releasenotes_1.6.0.html
Simple merge
author	larsk <lars.kurth@citrix.com>
	Tue, 27 Nov 2012 15:48:11 +0000 (15:48 +0000)
committer	larsk <lars.kurth@citrix.com>
	Tue, 27 Nov 2012 15:48:11 +0000 (15:48 +0000)