K 10 svn:author V 8 jonathan K 8 svn:date V 27 2011-07-05T14:58:10.715211Z K 7 svn:log V 182 Merge r223505 from HEAD to stable/7: -- Tidy up a capabilities-related comment. This commit refers to an #ifdef that hasn't been merged [yet?]; remove it. Approved by: rwatson -- END