[mumble/f14: 7/7] Merge branch 'master' into f14

[Andreas Osowski]

commit 0959331340db53c5c7d08bb5437b91d72c78ef0e
Merge: f7ed626 192f913
Author: Andreas Osowski <th0br0 at mkdir.name>
Date:   Tue May 17 23:37:16 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	mumble.spec

 .gitignore                   |    1 +
 mumble-1.2.3-slice2cpp.patch |   12 +++++++++
 mumble.spec                  |   57 +++++++++++++++++++++++++++++++++--------
 murmur-tmpfiles.conf         |    1 +
 sources                      |    2 +-
 5 files changed, 61 insertions(+), 12 deletions(-)
---