Merge
authorDmitry Baranovskiy <Dmitry@Baranovskiy.com>
Tue, 17 Aug 2010 06:18:24 +0000 (16:18 +1000)
committerDmitry Baranovskiy <Dmitry@Baranovskiy.com>
Tue, 17 Aug 2010 06:18:24 +0000 (16:18 +1000)

Trivial merge