[Miro/f14/master: 3/3] Merge branch 'master' into f14

[Michel Alexandre Salim]

commit 67d8298f113631c320eb6ef34da171c9722f6dc7
Merge: 69d427d 6d80909
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Mar 5 19:17:21 2011 +0100

    Merge branch 'master' into f14

 .gitignore                    |    2 +-
 Miro.spec                     |   21 ++++++++-------------
 miro-3.5-force_int_dims.patch |   17 -----------------
 sources                       |    2 +-
 4 files changed, 10 insertions(+), 32 deletions(-)
---