merge bugfix #2986807 (question and answer formats swapped in import of Palm databases) from trunk (merge -c 2304)
Authored by: ndegendogo 2010-04-17
Parent: [r2313]
Child: [r2315]