Merge branch 'master' into terencehill/menu_focus_stuff
authorterencehill <piuntn@gmail.com>
Wed, 14 Mar 2012 21:29:12 +0000 (22:29 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 14 Mar 2012 21:29:12 +0000 (22:29 +0100)

Trivial merge