Merge branch 'cuttingedge'
authorDmitry Baranovskiy <dbaranovskiy@Fresh-Air.sydney.atlassian.com>
Thu, 18 Mar 2010 22:25:52 +0000 (09:25 +1100)
committerDmitry Baranovskiy <dbaranovskiy@Fresh-Air.sydney.atlassian.com>
Thu, 18 Mar 2010 22:25:52 +0000 (09:25 +1100)

Trivial merge