[microcode_ctl/f13/master: 5/5] Merge branch 'f14' into f13

[Toshio くらとみ]

commit 8f64b0d820ad2fb119c22c6dae7f9fb62949b30f
Merge: aed742a 66db1f3
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Sep 7 14:03:49 2010 -0400

    Merge branch 'f14' into f13
    
    Conflicts:
    	microcode_ctl.spec

 microcode_ctl.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---