commit 093cd49c218f2094f70a2d93ffc315031c4125f6 Merge: 4428181 b03b2b3 Author: Fabian Deutsch <fabian.deutsch at gmx.de> Date: Wed May 2 17:41:30 2012 +0200 Merge branch 'master' into f17 Conflicts: presence.spec Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de> ---