[mpop/f14/master] (4 commits) ...Merge branch 'master' into f14

[Fabian Affolter]

Summary of changes:

  05df68e... * Mon Jan 17 2011 Fabian Affolter <fabian at bernewireless.net (*)
  c09078c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  8c8ab3e... * Mon Mar 28 2011 Fabian Affolter <fabian at bernewireless.net (*)
  9ed8708... Merge branch 'master' into f14

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