Merge remote branch 'origin/master'
Barış Metin [Mon, 19 Jul 2010 08:50:55 +0000 (10:50 +0200)]

Trivial merge