vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9520 commits 7 branches 0 tags 72 MiB
Commit graph

281 commits

Author SHA1 Message Date
Andrei Borzenkov
e2dd6daa8c grub-fs-tester: consistently print output of grub ls if test fails 2014-11-20 20:56:51 +03:00
Vladimir Serbinenko
636977b089 Mark strings for translation and add remaining ones to exclude list. 2013-12-18 06:50:24 +01:00
Colin Watson
3a82f8bb48 Fix grub-shell to avoid breaking "make distcheck" 
Copying the themes directory in grub-shell isn't
parallel-test-friendly and breaks on the second test when the source
directory is read-only (as in "make distcheck").  Instead, add a
hidden --themes-directory option to grub-mkrescue et al, and use it
in grub-shell.
 2013-12-04 13:36:34 +00:00
Colin Watson
fc3f2b72cd * tests/util/grub-fs-tester.in: Execute xorriso from $PATH rather 
than hardcoding /usr/local/bin/xorriso.
 2013-11-26 23:51:48 +00:00
Vladimir Serbinenko
7d44ff7de6 Add automated filesystem checking based on scripts I've used now for 
quite some time locally. Most of the test require root so they are
	skipped when run without necessarry privelegies.
 2013-11-19 21:05:59 +01:00
Vladimir Serbinenko
2d6a38fbf7 Merge branch 'master' of git.sv.gnu.org:/srv/git/grub 2013-11-18 17:46:15 +01:00
Vladimir Serbinenko
bb2b275b7d * tests/grub_func_test.in: Decrease RAM size to 512M. With less 
fragmentation 512M is enough.
 2013-11-18 17:42:54 +01:00
Colin Watson
60870be86c * tests/gzcompress_test.in: Skip if gzip is not installed (unlikely, 
but for symmetry).
* tests/lzocompress_test.in: Skip if lzop is not installed.
* tests/xzcompress_test.in: Skip if xz is not installed.
 2013-11-18 16:16:33 +00:00
Vladimir Serbinenko
efb8de492a * tests/util/grub-shell.in: Increase console size to 1024x1024. 2013-11-18 16:32:22 +01:00
Colin Watson
1e8e2e78a5 * tests/util/grub-shell.in: Don't fail on emu platform if po/*.gmo 
files have not been built.
 2013-11-18 14:02:11 +00:00
Vladimir Serbinenko
35c2851cc1 * tests/util/grub-shell.in: Use -cdrom and don't force cdrom 
on primary master on pseries.
 2013-11-18 14:40:41 +01:00
Vladimir Serbinenko
256ee7ac6a * tests/util/grub-shell.in: For powerpc tests put the CD-ROM as primary 
master since with some combinations of qemu and firmware only primary
	IDE channel is available.
 2013-11-18 11:51:46 +01:00
Vladimir Serbinenko
77dae919b6 * tests/grub_func_test.in: Increase memory reservation as on EFI we need 
to leave some memory to firmware.
 2013-11-17 02:16:21 +01:00
Vladimir Serbinenko
b80c2d6d4b * tests/core_compress_test.in: Use full arguments as grub-mkimage-extra 
now needs full arguments.
 2013-11-17 02:09:15 +01:00
Vladimir Serbinenko
889ebe922b * tests/util/grub-shell.in: Use escc-ch-b on powerpc. This is missing 
counterpart of fixing the naming of escc ports.
 2013-11-17 00:57:54 +01:00
Vladimir Serbinenko
cd46aa6cef Rewrite grub-install, grub-mkrescue, grub-mkstandalone and grub-mknetdir 
the function of these files exceeds what can be sanely handled in shell
	in posix-comaptible way. Also writing it in C extends the functionality
	to non-UNIX-like OS and minimal environments.
 2013-11-16 20:21:16 +01:00
Vladimir Serbinenko
31747dd521 * grub-core/tests/gfxterm_menu.c (gfxterm_menu): Handle out-of-memory 
condition.
	* tests/grub_func_test.in: Increase memory allocation.
 2013-11-12 00:44:00 +01:00
Vladimir Serbinenko
665c575b2a * tests/util/grub-shell.in: Boot as hdd on ppc by default. 2013-11-08 05:22:36 +01:00
Vladimir Serbinenko
87a04a2df6 * tests/test_sha512sum.in: Make it work on emu. 2013-11-07 02:41:09 +01:00
Vladimir Serbinenko
8b3e6eb6b6 * tests/util/grub-shell.in: Copy themes. 2013-11-02 19:17:25 +01:00
BVK Chaitanya
1e6ad6a668 * tests/util/grub-shell.in: Add new --debug option. 2013-10-26 15:01:28 +02:00
BVK Chaitanya
188929ebee * tests/test_unset.in: New test. 2013-10-26 14:52:54 +02:00
BVK Chaitanya
7994a09a9b * tests/test_sha512sum.in: New test. 2013-10-26 14:35:35 +02:00
Vladimir Serbinenko
3d695d7b93 * tests/date_unit_test.c: New test. 2013-10-26 02:48:19 +02:00
Vladimir 'phcoder' Serbinenko
bbd2b5396b * grub-core/kern/misc.c (grub_vsnprintf_real): Fix formatting of 
"(null)" string.
	Simplify expressions to save around 256 bytes in kernel.img.
	* tests/printf_unit_test.c (printf_test): Add "(null)" tests.
 2013-10-19 23:52:09 +02:00
BVK Chaitanya
3d46c22f5b Added `tr' command support. 
* grub-core/commands/tr.c: New file.
	* grub-core/Makefile.core.def: Build rules for new module.

	* tests/grub_cmd_tr.in: New test.
	* Makefile.util.def: Build rules for new test.
 2013-10-17 19:06:29 +02:00
Vladimir 'phcoder' Serbinenko
148f100768 * grub-core/kern/misc.c (grub_vsnprintf_real): Handle %% properly. 
* tests/printf_unit_test.c (printf_test): Add %% tests.
	Reported by: Paulo Flabiano Smorigo.
 2013-10-15 15:12:15 +02:00
Vladimir 'phcoder' Serbinenko
0caa407cd4 * tests/gettext_strings_test.in: Add getroot_*.c to exclude list. 2013-10-03 23:25:48 +02:00
Vladimir 'phcoder' Serbinenko
4f47d809c7 * tests/grub_func_test.in: Add unicode.pf2. 2013-08-02 22:59:21 +02:00
Colin Watson
e639c204e0 * util/grub-script-check.c: Fail on scripts containing no 
commands, to guard against corrupted grub-mkconfig setups that
produce no useful output.
* tests/grub_script_no_commands.in: New test.
* Makefile.util.def (grub_script_no_commands): Add.
Reported by Hans Putter.  Fixes Debian bug #713886.
 2013-06-25 15:08:11 +01:00
Vladimir 'phcoder' Serbinenko
0301a8b36d * tests/grub_script_eval.in: Really add the eval test. 2013-06-15 17:39:45 +02:00
Radosław Szymczyszyn
1e908b34a6 * grub-core/partmap/dfly.c: New partition map. 2013-05-15 17:26:49 +02:00
Vladimir 'phcoder' Serbinenko
1202c76486 * tests/util/grub-shell.in: Remove the temporary directory on grub-emu 
after the test.
 2013-05-14 08:41:39 +02:00
Vladimir 'phcoder' Serbinenko
43fe02cbaf * tests/gettext_strings_test.in: A test to check for strings not 
marked for translation.
 2013-05-07 11:47:30 +02:00
Vladimir 'phcoder' Serbinenko
1eed0e6ebc * tests/priority_queue_unit_test.cc: New test. 2013-05-07 11:30:48 +02:00
Vladimir 'phcoder' Serbinenko
b7c036bce3 More video checks. 2013-05-04 14:00:14 +02:00
Vladimir 'phcoder' Serbinenko
daf01d61ff Fix test -a and -o precedence. 
Reported by: adrian15.
 2013-05-04 13:38:59 +02:00
Vladimir 'phcoder' Serbinenko
c104b6f93e New series of tests for gfxterm and gfxmenu. 2013-05-03 14:09:55 +02:00
Vladimir 'phcoder' Serbinenko
5036166022 First automated video test (running videotest and comparing results) 2013-05-02 14:39:03 +02:00
Vladimir 'phcoder' Serbinenko
3f9634e550 Add few more tests. 2013-04-30 17:41:32 +02:00
Vladimir 'phcoder' Serbinenko
f7457fb231 Add few new tests. 2013-04-29 12:25:57 +02:00
Vladimir 'phcoder' Serbinenko
b75e66135f missing file 2013-04-27 22:55:02 +02:00
Vladimir 'phcoder' Serbinenko
e7b8fd08c5 Core compression test. 2013-04-27 19:44:00 +02:00
Vladimir 'phcoder' Serbinenko
f25a2ba6b8 Fix pseries test. 2013-04-27 14:11:12 +02:00
Vladimir 'phcoder' Serbinenko
a6393224c4 Make 'make check' work on emu. 2013-04-27 02:00:16 +02:00
Vladimir 'phcoder' Serbinenko
c1b00fffdf * tests/pseries_test.in: New test. 2013-04-26 19:09:55 +02:00
Vladimir 'phcoder' Serbinenko
f93e89ef90 Add test to check that different boot mediums work. 2013-04-26 14:33:31 +02:00
Vladimir 'phcoder' Serbinenko
7f63a64fa0 Enable mipsel-arc. 2013-04-25 22:42:35 +02:00
Vladimir 'phcoder' Serbinenko
86eb23bc8f * tests/partmap_test.in: Add missing double semicolon. 2013-04-25 02:22:20 +02:00
Vladimir 'phcoder' Serbinenko
6aff01075d Make check work on mips-arc. 2013-04-24 22:24:28 +02:00
Vladimir 'phcoder' Serbinenko
88017d47a9 * tests/grub_cmd_date.in: Skip on sparc64. 2013-04-15 01:54:23 +02:00
Vladimir 'phcoder' Serbinenko
fa7d914e6c * tests/grub_script_expansion.in: Use fixed-string grep to skip over 
firmware error messages.
 2013-04-15 01:53:33 +02:00
Vladimir 'phcoder' Serbinenko
5351da81e0 * tests/grub_cmd_date.in: Add missing exit 1. 2013-04-14 17:19:04 +02:00
Vladimir 'phcoder' Serbinenko
c9d586ea17 * tests/partmap_test.in: Skip on sparc64. 2013-04-14 17:16:32 +02:00
Vladimir 'phcoder' Serbinenko
3f72974141 Support grub-shell on sparc64. 2013-04-14 17:13:58 +02:00
Vladimir 'phcoder' Serbinenko
a3d566d442 Disable partmap check on i386-ieee1275 due to openfirmware issues. 2013-04-12 17:51:43 +02:00
Vladimir 'phcoder' Serbinenko
a936af564c * tests/util/grub-shell.in: Fix it on powerpc. 2013-04-12 14:52:05 +02:00
Vladimir 'phcoder' Serbinenko
e3734b84cf * tests/grub_cmd_date.in: New test for datetime. 2013-04-12 01:47:38 +02:00
Vladimir 'phcoder' Serbinenko
f9d4005539 * tests/partmap_test.in: Fix missing qemudisk setting. 2013-04-12 01:44:14 +02:00
Vladimir 'phcoder' Serbinenko
dbc56d8f0b Support i386-ieee1275 grub-mkrescue and make check on it. 2013-04-12 01:29:45 +02:00
Colin Watson
fd49ceb35c Apply program name transformations at build-time rather than at 
run-time.  Fixes Debian bug #696465.

* acinclude.m4 (grub_TRANSFORM): New macro.
* configure.ac: Create output variables with transformed names for
most programs.
* util/bash-completion.d/grub-completion.bash.in: Use
pre-transformed variables for program names.
* util/grub-install.in: Likewise.
* util/grub-kbdcomp.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mkconfig_lib.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
* tests/util/grub-shell-tester.in: Remove unused assignment.
* tests/util/grub-shell.in: Likewise.
* util/grub.d/00_header.in: Likewise.
 2012-12-28 06:57:17 +00:00
Vladimir 'phcoder' Serbinenko
a370616293 * tests/util/grub-shell.in: Fix a typo. 2012-06-22 21:59:10 +02:00
Vladimir 'phcoder' Serbinenko
eac49cffc8 Add loongson tests. 
* tests/util/grub-shell.in: Handle loongson.
	* tests/partmap_test.in: Add loongson to the list of platform using ATA
	drivers.
	* grub-core/tests/boot/linux.init-mips.S (SHUTDOWN_MAGIC3) [REBOOT]:
	Reboot instead of shutdown if REBOOT is defined.
 2012-06-15 19:42:25 +02:00
Vladimir 'phcoder' Serbinenko
5561c22d59 * tests/grub_script_expansion.in: Explicitly tell grep that we handle 
text and not binary.
 2012-06-09 19:58:38 +02:00
Vladimir 'phcoder' Serbinenko
34b2bced3f * tests/partmap_test.in: Skip on ppc due to serious firmware bug. 2012-06-08 23:02:37 +02:00
Vladimir 'phcoder' Serbinenko
5e619f408d Fix wildcard escaping. 
* grub-core/commands/wildcard.c (wildcard_escape): Moved from here ...
	* grub-core/script/execute.c (wildcard_escape): .. to here.
	Don't escape dot.
	* grub-core/commands/wildcard.c (wildcard_unescape): Moved from here ...
	* grub-core/script/execute.c (wildcard_unescape): .. to here.
	Don't escape dot.
	* grub-core/script/execute.c (gettext_append): Always escape.
	(grub_script_arglist_to_argv): Always handle escaping/unescaping.
	* grub-core/script/yylex.l: Don't cut away the escaping.
	* tests/grub_script_echo1.in: Add tests with wildcard.
 2012-06-08 22:54:21 +02:00
Vladimir 'phcoder' Serbinenko
f57c84cd60 * tests/grub_script_expansion.in: Skip network protocols. 2012-06-08 20:31:05 +02:00
Vladimir 'phcoder' Serbinenko
ecfc6207d6 * tests/util/grub-shell.in: Use escc-ch-a port on ppc. 2012-06-08 20:29:15 +02:00
Vladimir 'phcoder' Serbinenko
08a14e0b71 * tests/util/grub-shell.in: Trim firmware output on EFI. 2012-06-07 16:33:17 +02:00
Vladimir 'phcoder' Serbinenko
60fde14d3e Move handling of GRUB_QEMU_OPTS to grub-shell so that make check works. 
* Makefile.am: Remove GRUB_QEMU_OPTS handling.
	* tests/util/grub-shell.in: Add GRUB_QEMU_OPTS handling.
 2012-06-07 14:14:02 +02:00
Vladimir 'phcoder' Serbinenko
37ba07ebaf Extend automated tests to qemu-mips. 
* Makefile.am: reorganise tests and enable qemu-mips.
	* configure.ac (COND_mipseb), (COND_mipsel): New conditions.
	* grub-core/tests/boot/linux.init-mips.S: New file.
	* tests/partmap_test.in: Handle ata0 disks.
	* tests/util/grub-shell.in: Handle qemu-mips. Make defaults work on
	non-pc i386.
 2012-06-06 12:36:33 +02:00
Vladimir 'phcoder' Serbinenko
1c4afb6095 * tests/cmp_unit_test.c: Add missing failure message. 
* tests/example_unit_test.c: Likewise.
	* tests/printf_unit_test.c: Likewise.
 2012-05-30 13:54:30 +02:00
Vladimir 'phcoder' Serbinenko
eea1e26e52 * grub-core/script/yylex.l: Ugly fix for "\\\n ". 
* tests/grub_script_echo1.in: Add tests.
 2012-05-08 23:20:02 +02:00
Vladimir 'phcoder' Serbinenko
ce41ab7aab * grub-core/kern/misc.c (grub_strcmp): Use unsigned comparison as 
per common usage and preffered in several parts of code.
	(grub_memcmp): Likewise.
	(grub_strncmp): Likewise.
	* include/grub/misc.h (grub_strcasecmp): Likewise.
	(grub_strncasecmp): Likewise.
	* Makefile.util.def (cmp_test): New test.
	(grub_script_strcmp): Likewise.
	* tests/cmp_unit_test.c: New file.
	* tests/grub_script_strcmp.in: Likewise.
	* grub-core/fs/hfsplus.c (grub_hfsplus_cmp_catkey): Add a comment.
 2012-05-04 12:08:22 +02:00
Vladimir 'phcoder' Serbinenko
b9153381b8 * util/grub-mknetdir.in: Rename --override-directory to --directory and 
document it.
	* tests/util/grub-shell.in: Update to --directory.
 2012-04-14 15:20:45 +02:00
Vladimir 'phcoder' Serbinenko
16fc9293d6 * tests/util/grub-shell.in: Set pkgdatadir when calling grub-mkrescue 
and grub-mknetdir.
 2012-04-11 22:43:15 +02:00
Vladimir 'phcoder' Serbinenko
ac6fd21803 * grub-core/script/argv.c (grub_script_argv_split_append): Skip leading 
spaces.
	* tests/grub_script_leading_whitespace.in: New file.
	* Makefile.util.def (grub_script_leading_whitespace): New test.
 2012-03-19 13:29:43 +01:00
Vladimir 'phcoder' Serbinenko
546fbe9b5a Add variable parsing in $"..." and fix several mismatches with bash. 
* Makefile.util.def (grub_script_gettext): New test.
	* grub-core/script/execute.c (parse_string): New function.
	(gettext_append): Likewise.
	(grub_script_arglist_to_argv): Use gettext_append.
	* grub-core/script/yylex.l: Fix slash and newline handling in $"...".
	* tests/grub_script_gettext.in: New file.
 2012-03-11 14:46:48 +01:00
Vladimir 'phcoder' Serbinenko
9fdb2d7b11 Fix handling of leading spaces in scripts. 
* grub-core/normal/cmdline.c (grub_cmdline_get): Don't strip leading
	spaces.
	* grub-core/normal/main.c (grub_file_getline): Remove all preprocessing
	other than skipping \r. All users updated.
	* tests/grub_script_echo1.in: Add space-related tests.
	* util/grub-menulst2cfg.c (main): Remove useless space skipping.
 2012-03-11 14:43:18 +01:00
Vladimir 'phcoder' Serbinenko
3fd8bae5cf * tests/partmap_test.in: Replace qemu-img usage with dd to decrease 
dependencies.
 2012-03-10 14:35:17 +01:00
Vladimir 'phcoder' Serbinenko
53f13848f1 Remove platform and target_cpu replacement. 
* configure.ac: Remove platform and target_cpu substitutions.
	* tests/util/grub-shell.in: Use modinfo.
	* util/powerpc/ieee1275/grub-mkrescue.in: Specify powerpc-ieee1275
	explicitly.
 2012-02-27 16:46:52 +01:00
Vladimir 'phcoder' Serbinenko
e51b56667a * include/grub/test.h (grub_unit_test_init): Add missing prototype. 
(grub_unit_test_fini): Likewise.
	* tests/lib/unit_test.c (main): Remove extra nested external prototype.
 2012-02-12 22:04:55 +01:00
Vladimir 'phcoder' Serbinenko
f8a9ab1245 * grub-core/commands/wildcard.c (match_files): Handle filenames 
without explicit device.
	(wildcard_expand): Don't add explicit device if not already present.
	* tests/grub_script_echo1.in: Add a new expansion test.
 2012-01-24 13:34:36 +01:00
Vladimir 'phcoder' Serbinenko
48b391e9ab Handle newer autotools. Add some missing quotes while on it. 
* Makefile.am (pkglib_DATA): Remove update-grub_lib.
	(pkglib_DATA): Move grub-mkconfig_lib from here ...
	(pkgdata_DATA): ... here.
	* Makefile.util.def (update-grub_lib): Removed.
	* conf/Makefile.common (pkglib_DATA): Removed.
	(pkglib_SCRIPTS): Likewise.
	(pkgdata_DATA): New variable.
	* tests/util/grub-shell-tester.in: Replace pkglib with pkgdata where
	needed.
	Add missing quotes.
	Remove unused variable while on it.
	* tests/util/grub-shell.in: Likewise.
	* util/grub-install.in: Likewise.
	* util/grub-mkconfig.in: Likewise.
	* util/grub-mknetdir.in: Likewise.
	* util/grub-mkrescue.in: Likewise.
	* util/grub-mkstandalone.in: Likewise.
	* util/grub.d/00_header.in: Likewise.
	* util/grub.d/10_hurd.in: Likewise.
	* util/grub.d/10_illumos.in: Likewise.
	* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
	* util/grub.d/10_netbsd.in: Likewise.
	* util/grub.d/10_windows.in: Likewise.
	* util/grub.d/20_linux_xen.in: Likewise.
	* util/grub.d/30_os-prober.in: Likewise.
	* util/update-grub_lib.in: Removed.
 2012-01-24 13:17:36 +01:00
Vladimir 'phcoder' Serbinenko
12d4f965cd Support %1$d syntax. 
* tests/printf_unit_test.c: New file.
	* Makefile.util.def (printf_test): New test.
	* grub-core/kern/misc.c (grub_vsnprintf_real): Support %1$d syntax.
 2011-11-11 21:14:41 +01:00
Colin Watson
5626056ffb * grub-core/genmod.sh.in: Use 'set -e' rather than '#! /bin/sh -e', 
to avoid accidents when debugging with 'sh -x'.
* grub-core/gensyminfo.sh.in: Likewise.
* tests/example_scripted_test.in: Likewise.
* tests/grub_cmd_regexp.in: Likewise.
* tests/grub_script_blanklines.in: Likewise.
* tests/grub_script_dollar.in: Likewise.
* tests/grub_script_expansion.in: Likewise.
* tests/grub_script_final_semicolon.in: Likewise.
* tests/partmap_test.in: Likewise.
* tests/util/grub-shell-tester.in: Likewise.
* tests/util/grub-shell.in: Likewise.
 2011-05-18 12:53:07 +01:00
Vladimir 'phcoder' Serbinenko
4959e11109 Use mipsel- rather than mips- in directories involving mipsel ports to 
allow both endiannesses coexist.

	* configure.ac: proparate target_cpu=mipsel rather than resetting to
	mips. All conditions adjusted.
	* tests/util/grub-shell-tester.in: Remove gratuitious target_cpu
	variable.
	* util/grub-install.in: Adjust conditions to take renaming into account.
	* util/grub-mkimage.c (image_targets): Likewise. New target
	mips-qemu_mips-elf for bigendian mips.
 2011-05-17 22:48:20 +02:00
Colin Watson
4ebff75340 * tests/partmap_test.in: Don't hardcode path to parted. 
Reported by: Peter Hjalmarsson.  Fixes Savannah bug #33150.
 2011-05-03 17:57:39 +01:00
Colin Watson
415502c26a * tests/util/grub-shell.in: Set serial terminfo type to `dumb', to 
avoid causing test failures by clearing the screen.
 2011-01-06 13:24:38 +00:00
Jordan Uggla
ab66c69f1a * tests/util/grub-shell.in: Suppress "ACPI shutdown failed" error to 
keep unit tests from failing when they shouldn't.
 2010-12-23 11:51:18 +00:00
BVK Chaitanya
a8152fedab suppress shell expansion inside quoted strings 2010-11-07 16:13:14 +05:30
Grégoire Sutre
b65ea15514 Make mktemp invocations portable. 2010-10-18 22:50:01 +02:00
BVK Chaitanya
79c93b429e echo test case 2010-09-20 13:51:16 +05:30
Vladimir 'phcoder' Serbinenko
9b5b2541a2 grub-mknetdir script. 
* Makefile.util.def (grub-mknetdir): New module.
	* tests/util/grub-shell.in: Support boot=net
	* util/grub-mknetdir.in: New file.
 2010-09-13 14:03:05 +02:00
bvk.groups@gmail.com
8901b00c88 * tests/partmap_test.in: New test for partitions. 
* Makefile.util.def: Rules for new test.
 2010-09-09 21:24:17 +05:30
bvk.groups@gmail.com
56672f4a8b added new partmaps test 2010-09-09 21:10:17 +05:30
BVK Chaitanya
1bce65c7b1 not command (!) support 2010-09-05 14:57:28 +05:30
BVK Chaitanya
ee14ec9935 merge with mainline 2010-09-04 22:34:32 +05:30
BVK Chaitanya
a431c98a52 merge with mainline 2010-09-04 22:13:45 +05:30
BVK Chaitanya
165bfce138 merge with mainline 2010-09-04 20:44:44 +05:30