Merge remote-tracking branch 'coss/hotfix/abstract-controller'
authorRob Allen <rob@akrabat.com>
Sat, 30 Jun 2012 19:34:57 +0000 (20:34 +0100)
committerRob Allen <rob@akrabat.com>
Sat, 30 Jun 2012 19:34:57 +0000 (20:34 +0100)

Trivial merge