Fix merge conflicts

diff --cc AUTHORS
index a271a5e,bf785f6..81378c2
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -63,12 -62,12 +63,15 @@@ Andrew Bays <abays at redhat.com
  Andy Parkins <andyp at fussylogic.co.uk>
   - battery plugin: sysfs code.
  
+ Aneesh Puttur <aputtur at redhat.com>
+  - connectivity plugin.
+ 
  Andy Smith <ansmith at redhat.com>
   - AMQP 1.0 plugin.
-  
+ 
 +Aneesh Puttur <aputtur at redhat.com>
 + - connectivity plugin.
 +
  Anthony Dewhurst <dewhurst at gmail.com>
   - zfs_arc plugin.
  

diff --cc configure.ac
Simple merge