Merge branch 'master' into context_button_bar_width
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 6 Sep 2010 08:49:42 +0000 (11:49 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 6 Sep 2010 08:49:42 +0000 (11:49 +0300)

Trivial merge