Help decrease conflicts between SVN trunk and Cisco git branch of OMPI v1.6 branch

This commit was SVN r29715.

ompi/mca/btl/usnic/btl_usnic_ack.h

@@ -31,7 +31,7 @@
             &(send_frag)->sf_base.uf_base,                                    \
             OMPI_SUCCESS);                                                    \
         frag->sf_base.uf_base.des_flags &= ~MCA_BTL_DES_SEND_ALWAYS_CALLBACK; \
-        ++((module)->stats.pml_send_callbacks);                                     \
+        ++((module)->stats.pml_send_callbacks);                               \
     } while (0)
 
 /*

ompi/mca/btl/usnic/btl_usnic_module.h

@@ -86,7 +86,7 @@ typedef struct ompi_btl_usnic_channel_t {
 } ompi_btl_usnic_channel_t;
 
 /**
- * usNIC BTL interface
+ * usNIC verbs BTL interface
  */
 typedef struct ompi_btl_usnic_module_t {
     mca_btl_base_module_t super;