[rhino/f19: 2/2] Merge branch 'master' into f19

[Peter Robinson]

commit 3ea3883713904c5dace855aa69b2fe30b6bae033
Merge: abdae0a bd514ee
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Sep 1 11:25:29 2013 +0100

    Merge branch 'master' into f19

 rhino.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---