Fix placement of clause in merge.

Author: rjmccall

abi.html

@@ -163,8 +163,8 @@ <h3><a href="#definitions"> 1.1 Definitions </a></h3>
 <p>
 <dt> <i>empty class</i> </dt>
 <dd>
-A class with no non-static data members,
-no unnamed bit-fields other than zero-width bit-fields and empty data members,
+A class with no non-static data members other than empty data members,
+no unnamed bit-fields other than zero-width bit-fields,
 no virtual functions, no virtual base classes,
 and no non-empty non-virtual proper base classes.