[rcssserver3d/f14: 5/5] Merge branch 'f15' into f14

[Hedayat Vatankhah]

commit 4bd0866a378af753dec2f7046c8aa6b1b1707669
Merge: 3720d11 f37c7db
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Mon Jun 20 15:14:53 2011 +0430

    Merge branch 'f15' into f14

 rcssserver3d-0.6.5-rulefix.patch |   17 +++++++++++++++++
 rcssserver3d.spec                |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---