Merged in [10685] from lars@netapp.com:

Commit r10578 broke search result table display due to the added column. Fix
this.  (Also update vnu.jar. Unrelated, but wasn't careful when committing.)
 - Legacy-Id: 10689
Note: SVN reference [10685] has been migrated to Git commit 820d406e33

ietf/templates/doc/search/search_result_row.html

@@ -97,8 +97,6 @@
     {% with doc|ballotposition:user as pos %}
     <td {% if pos %}class="changebar position-{{pos.slug}}"{% endif %}></td>
     {% endwith %}
-  {% else %}
-     <td></td>
   {% endif %}
   
 </tr>

ietf/templates/doc/search/search_results.html

@@ -34,6 +34,10 @@
             </th>
           {% endif %}
         {% endfor %}
+
+        {% if color_row_positions %}
+            <th class="sorter-false"></th>
+        {% endif %}
       </tr>
     </thead>
 
@@ -43,7 +47,11 @@
     <tbody>
         <tr class="info">
           <th></th>
+          {% if color_row_positions %}
+              <th colspan="{{ meta.headers|length }}">
+          {% else %}
               <th colspan="{{ meta.headers|length|add:"-1" }}">
+          {% endif %}
 	    {{ doc_group.grouper|plural:doc_group.list }}
           </th>
         </tr>