commit 4c342762f3af262281701cbe6e88a99c87022cbc Merge: 0f17368 c0cc447 Author: Ivan Romanov <drizt at land.ru> Date: Tue Jan 3 15:42:20 2012 +0600 Merge branch 'master' into f15 Conflicts: qconf.spec Saved Rex Deiter version qconf.spec | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) ---