[xorg-x11-drv-openchrome/f17: 2/2] Merge branch 'master' into f17

[Xavier Bachelot]

commit e9bf0e86806935960d9ad649bb0494f87af34fd8
Merge: e34526a 311feb5
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Thu May 23 17:38:38 2013 +0200

    Merge branch 'master' into f17

 .gitignore                   |    1 +
 sources                      |    2 +-
 xorg-x11-drv-openchrome.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---