[alex/f15: 4/4] Merge remote-tracking branch 'refs/remotes/origin/f16' into f15

[Jens Petersen]

commit beffe145be48edbae8be785c9c95c1182ab415c6
Merge: 8450398 d905708
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jan 18 20:33:22 2012 +0900

    Merge remote-tracking branch 'refs/remotes/origin/f16' into f15

 alex.spec |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---