[xorg-x11-drv-openchrome/f15: 6/6] Merge branch 'f15' of ssh://pkgs.fedoraproject.org/xorg-x11-drv-openchrome into f15

[Xavier Bachelot]

commit 0af5dff0caaf26d6c38070cf0cb9adc1ff59c9f7
Merge: d7869c1 cc89ab4
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Fri Feb 10 16:13:55 2012 +0100

    Merge branch 'f15' of ssh://pkgs.fedoraproject.org/xorg-x11-drv-openchrome into f15
    
    Conflicts:
    	xorg-x11-drv-openchrome.spec

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