[gnac] (17 commits) ...Fixed erroneous merge

[David Joaquim <djoaquim src gnome org>]

Summary of changes:

  74cf001... Removed markup from GTKBuilder translatable strings (*)
  d1b4615... Merge branch 'master' into devel (*)
  528b273... Code cleanup (*)
  21bc367... Added libunique support (trac ticket #39) (*)
  6f6a184... Escaped text to prevent warnings (*)
  22c79cc... Handled properly track-gain and track-peak tags (*)
  45cde34... Fixed a bug (*)
  2f9ca3b... Improved display of VBR files' bitrate (*)
  1e5ed9d... Disabled main interface during plugins' installation (*)
  08c22e8... Added WavPack filter (*)
  76546f2... Cleaned playlists handling (*)
  aa0cf78... Improved file filters (*)
  392ec06... Fixed a concurrency bug (*)
  599987c... Merge branch 'file-chooser' into devel (*)
  6bac2de... Merge branch 'master' into devel (*)
  d265013... Merge branch 'libunique' into devel (*)
  577ee4e... Fixed erroneous merge (*)

(*) This commit already existed in another branch; no separate mail sent