Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Mon, 8 Mar 2010 18:43:20 +0000 (11:43 -0700)
committerBrian Paul <brianp@vmware.com>
Mon, 8 Mar 2010 18:43:20 +0000 (11:43 -0700)
commite5923a1240d8b32f5af080b0b4191d3b9299a630
treeb186ab69c91eeb1be91c9f3705db82fead819728
parent39ab5ae30c303dd561252cb592d4de35814b6a70
parente1762fb870f86afc4f6bd000b4a1c059d161f10d
Merge branch '7.8'