[js/el6/master: 39/39] Sync with master branch

[Pavel Alexeev]

commit 4ef615ead5d3445ca684746b449184da63bc5a69
Merge: d8d1ab8 a58ffff
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Mon Jan 24 14:27:30 2011 +0300

    Sync with master branch

 js-1.5-va_copy.patch |    4 ++--
 js.spec              |   19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)
---