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)
commit82a38fef2d5876557d366f4b42a5d6e6f176f001
tree007adf0e4c8f910af801bdc7af7cbbeeecfac48e
parente2c5ea9def816cd74e3a8106f2e76c96870b0f36
parent2a85df91a5e657fb946ba88c86e52c790f060027
Merge branch 'master' of gitorious.org:meego-developer-tools/corewatcher