am 951e9a05: Merge from gingerbread

* commit '951e9a05ee8af86a7e0a5a5157a8baedbc8d4edf':
  Add the protocol column to the carriers table.