Merge commit '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp * commit '879664e3e2e0169aba53d88f6c30c8b15858315d': Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.