Merge branch 'master' of gitorious.org:meego-developer-tools/corewatcher
authorAuke Kok <auke-jan.h.kok@intel.com>
Wed, 2 Feb 2011 16:16:22 +0000 (11:16 -0500)
committerAuke Kok <auke-jan.h.kok@intel.com>
Wed, 2 Feb 2011 16:16:22 +0000 (11:16 -0500)

Trivial merge