Merge "Fix a simple logic mistake." into froyo