[xorg-x11-drv-r128: 2/2] Merge remote-tracking branch 'origin/f18'

[Kalev Lember]

commit dfc7482051acf4bd31ee173deb201dc1342d7e14
Merge: 24dc265 bf7d85b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat Jan 12 17:26:06 2013 +0100

    Merge remote-tracking branch 'origin/f18'

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