Merge branch 'track-memory'
authorStef Walter <stefw@collabora.co.uk>
Mon, 19 Sep 2011 07:39:28 +0000 (09:39 +0200)
committerStef Walter <stefw@collabora.co.uk>
Mon, 19 Sep 2011 07:39:28 +0000 (09:39 +0200)
commitbb10e659e8b855ad47a861c5b03465214fb3d560
treecb1f94407205f7e30bd9525371ffae3022d602ae
parent73a1ad763b81774e3f423cb77054bdeeda5f821d
parentefcf16d64440d668a56efdb446c725339e072f89
Merge branch 'track-memory'
egg/egg-symkey.c
gcr/gcr-parser.c