Merge branch 'stacked_friends'
[situare] / res / text /
2010-03-26 Pekka NissinenInitial version