[polarssl/f18: 2/2] Merge branch 'f17' into f18

[Mads Kiilerich]

commit d1b0e743077c85f4a3107cedc2489b47a58efd4f
Merge: a544fa9 2553f8b
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Sun Mar 31 03:06:13 2013 +0200

    Merge branch 'f17' into f18

 .gitignore    |    1 +
 polarssl.spec |    7 +++----
 sources       |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---