Merge commit 'origin/master'
authorMikko Vartiainen <mvartiainen@gmail.com>
Mon, 21 Sep 2009 20:41:07 +0000 (23:41 +0300)
committerMikko Vartiainen <mvartiainen@gmail.com>
Mon, 21 Sep 2009 20:41:07 +0000 (23:41 +0300)

Trivial merge