[alexandria/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

commit 9c277f5f1cbc953500bb3fcccdcbac27a84d31c4
Merge: 2193933 7dd7dd0
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sat Oct 27 03:53:12 2012 +0900

    Merge remote-tracking branch 'origin/master' into f17

 alexandria-0.6.9-delete-broken-yaml.patch |   87 +++++++++++++++++++++++++++++
 alexandria.spec                           |   10 +++-
 2 files changed, 96 insertions(+), 1 deletions(-)
---