stable-20110124
8a528029 · Merge remote branch 'origin/master' ·