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

[Adam Tkac]

commit e5e17ab32fdeb955d46b6b471b45600d4acca3f9
Merge: af111f6 dd793e2
Author: Adam Tkac <atkac at redhat.com>
Date:   Thu Jun 7 12:05:02 2012 +0200

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

 quagga-CVE-2012-1820.patch |   74 ++++++++++++++++++++++++++++++++++++++++++++
 quagga.spec                |    9 +++++-
 2 files changed, 82 insertions(+), 1 deletions(-)
---