Merge from trunk

src/calibre/devices/hanlin/driver.py

@@ -64,7 +64,7 @@ def osx_sort_names(self, names):
         return names
 
     def linux_swap_drives(self, drives):
-        if len(drives) < 2: return drives
+        if len(drives) < 2 or not drives[1] or not drives[2]: return drives
         drives = list(drives)
         t = drives[0]
         drives[0] = drives[1]
@@ -95,7 +95,6 @@ class HANLINV5(HANLINV3):
     gui_name       = 'Hanlin V5'
     description    = _('Communicate with Hanlin V5 eBook readers.')
 
-
     VENDOR_ID	= [0x0492]
     PRODUCT_ID	= [0x8813]
     BCD         = [0x319]

src/calibre/gui2/metadata/basic_widgets.py

@@ -208,7 +208,7 @@ def initialize(self, db, id_):
         for i in all_authors:
             id, name = i
             name = name.strip().replace('|', ',')
-            self.addItem(authors_to_string(name))
+            self.addItem(name)
 
         self.set_separator('&')
         self.set_space_before_sep(True)