Fatal error on merge duplicate contacts (query looking for non-existent is_billing column in civicrm_openid table)

Got this fatal error when trying to merge duplicate contact records:

---

SELECT *
FROM civicrm_openid
WHERE ( is_billing = 1 ) AND ( civicrm_openid.contact_id = 102 )
[nativecode=1054 ** Unknown column 'is_billing' in 'where clause']

---

Dupe contact (left side of merge) has 1 contrib record, 1 participant record and 2 activity records. Has a single "Home" email address. Main contact (right side) also has a Home email address. I've checked "Add New" and selected "Work" (so that the dupe contact's Home email becomes the main contact's Work email). Screenshot of merge form is attached.

— backtrace from log file ----

[info] $backTrace = /Users/dgg/svn/trunk/CRM/Core/Error.php, backtrace, 190
, handle,
/Users/dgg/svn/trunk/packages/PEAR.php, call_user_func, 912
/Users/dgg/svn/trunk/packages/DB.php, PEAR_Error, 966
/Users/dgg/svn/trunk/packages/PEAR.php, DB_Error, 574
/Users/dgg/svn/trunk/packages/DB/common.php, raiseError, 1903
/Users/dgg/svn/trunk/packages/DB/mysql.php, raiseError, 898
/Users/dgg/svn/trunk/packages/DB/mysql.php, mysqlRaiseError, 327
/Users/dgg/svn/trunk/packages/DB/common.php, simpleQuery, 1216
/Users/dgg/svn/trunk/packages/DB/DataObject.php, query, 2394
/Users/dgg/svn/trunk/packages/DB/DataObject.php, _query, 442
/Users/dgg/svn/trunk/CRM/Contact/BAO/Contact.php, find, 1948
/Users/dgg/svn/trunk/CRM/Contact/Form/Merge.php, getLocBlockIds, 344
/Users/dgg/svn/trunk/CRM/Core/Form.php, postProcess, 248
/Users/dgg/svn/trunk/CRM/Core/StateMachine.php, mainProcess, 166
/Users/dgg/svn/trunk/CRM/Core/QuickForm/Action/Next.php, perform, 63
/Users/dgg/svn/trunk/packages/HTML/QuickForm/Controller.php, perform, 203
/Users/dgg/svn/trunk/packages/HTML/QuickForm/Page.php, handle, 103
/Users/dgg/svn/trunk/CRM/Core/Controller.php, handle, 249
/Users/dgg/svn/trunk/CRM/Utils/Wrapper.php, run, 114
/Users/dgg/svn/trunk/CRM/Core/Invoke.php, run, 181
/Users/dgg/svn/trunk/drupal/civicrm.module, invoke, 332
, civicrm_invoke,
/Users/dgg/htdocs/drupal69/includes/menu.inc, call_user_func_array, 348
/Users/dgg/htdocs/drupal69/index.php, menu_execute_active_handler, 18