ITR 1 or 2 ?

ITR-1.

ITR -1 is to be used by an individual whose total income for the assessment year 2010-11 includes:-
(a) Income from Salary/ Pension; or
(b) Income from One House Property (excluding cases where loss is brought forward from previous years); or
(c) Income from Other Sources (Excluding Winning from Lottery and Income from Race Horses).

Is ITR 1 for salary or Income from 1 house property ? What if it is from both the sources ?
 

It is for one of them also and for both also..