Merge branch 'meego-7093' into idle-release
Len Brown [Wed, 29 Sep 2010 03:30:58 +0000 (23:30 -0400)]

Trivial merge