diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-05-06 10:21:37 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-05-06 10:21:47 +0100 |
| commit | a2a4ee5e5561e3169cf179723982c09647b4739b (patch) | |
| tree | dd8a2c80381829e8cc8ed8005a3104e62c25f4ba | |
| parent | 0d62d8c2400f026b4200f5aa53d7f866461e7248 (diff) | |
| parent | 4aa90368112ea259a12e88de43f1effbc93f3821 (diff) | |
| parent | 839f32f28f5d2d09d56a8e32a63738e17b861622 (diff) | |
| parent | 5b19e7a752d5378eec4648af4d56ca15f6d700d7 (diff) | |
Merge branches 'update-parameters', 'property-setting-failure', 'reconnect' and 'no-request-channel'
Reviewed-by: Alberto Mardegan <alberto.mardegan@nokia.com>