Fix old old gingerbread merge conflict

Assuming that upstream-gingerbread is the branch you were merging in.
But anything is better than broken, even for gingerbread.

whatup krylon.
Merge pull request #47 from mateor/gingerbread-conflict

Fix old old gingerbread merge conflict - mateor