Merge commit 'rob/master' into experimental
authorDuClare <akarinotengoku@gmail.com>
Thu, 21 May 2009 18:49:53 +0000 (21:49 +0300)
committerDuClare <akarinotengoku@gmail.com>
Thu, 21 May 2009 18:49:53 +0000 (21:49 +0300)

Trivial merge