Merge branch 'master' of gitorious.org:meego-developer-tools/corewatcher
authorAuke Kok <auke-jan.h.kok@intel.com>
Fri, 8 Oct 2010 20:17:35 +0000 (13:17 -0700)
committerAuke Kok <auke-jan.h.kok@intel.com>
Fri, 8 Oct 2010 20:17:35 +0000 (13:17 -0700)

Trivial merge