Merge branch 'meego-7093' into idle-release
authorLen Brown <len.brown@intel.com>
Wed, 29 Sep 2010 03:30:58 +0000 (23:30 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 29 Sep 2010 03:30:58 +0000 (23:30 -0400)

Trivial merge