Merge commit 'diet/experimental' into experimental
authorDuClare <akarinotengoku@gmail.com>
Sat, 16 May 2009 14:53:28 +0000 (17:53 +0300)
committerDuClare <akarinotengoku@gmail.com>
Sat, 16 May 2009 14:53:28 +0000 (17:53 +0300)

Trivial merge