Merge branch 'vmx'
authorSøren Sandmann <sandmann@redhat.com>
Sun, 8 Jun 2008 23:55:43 +0000 (19:55 -0400)
committerSøren Sandmann <sandmann@redhat.com>
Sun, 8 Jun 2008 23:55:43 +0000 (19:55 -0400)
commitfb8f17fdf1eaec4ab8edba1486bfa83c0965d738
tree70cdbb3a540b4463b9df585271694242add50a57
parent9267b0bb549044591f28124a86e169b2235339b6
parent1063933bacb8b5d06b42b7b06a116339ce7c1f0c
Merge branch 'vmx'