Merge branch 'master' into windows_sdk_7.0
authorDave Cottlehuber <dave@muse.net.nz>
Wed, 7 Sep 2011 15:17:58 +0000 (03:17 +1200)
committerDave Cottlehuber <dave@muse.net.nz>
Wed, 7 Sep 2011 15:17:58 +0000 (03:17 +1200)
commit65c8743b56aa8ed87f19f0d24da134800075e627
tree15c8ca18002f50a4317df88e47ac77cdef08227a
parente221a30fc499bcb5a638b4d859d504a1eb29d6fa
parent5911fb9aec5d72af0132306b36086d4249d22389
Merge branch 'master' into windows_sdk_7.0