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

[Adam Tkac]

commit af111f69a7a4ab318772abf9d738d26dce7b4639
Merge: 30e802e 3e4599a
Author: Adam Tkac <atkac at redhat.com>
Date:   Thu May 3 13:28:53 2012 +0200

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

 quagga.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---