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

[Adam Tkac]

commit 349ec252a18d00f046a2b651e638dfb503905590
Merge: 8dd4db6 dd793e2
Author: Adam Tkac <atkac at redhat.com>
Date:   Thu Jun 7 12:07:07 2012 +0200

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

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