am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one...
am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo
Merge commit '1b679754' into kraken
* commit '1b679754':
Don't load photo if it's id is 0. Saves one database query