]> git.donarmstrong.com Git - lilypond.git/log
lilypond.git
14 years agoMusicXML: overriding part-name by part-name-display in score-part definition
Reinhold Kainhofer [Mon, 22 Feb 2010 12:53:00 +0000 (13:53 +0100)]
MusicXML: overriding part-name by part-name-display in score-part definition

14 years agoMusicXML: correctly escape backslash inside a string
Reinhold Kainhofer [Mon, 22 Feb 2010 12:52:05 +0000 (13:52 +0100)]
MusicXML: correctly escape backslash inside a string

14 years agoFiguredBass: When checking for continuation in FigBass, also use alterations
Reinhold Kainhofer [Mon, 15 Feb 2010 17:42:35 +0000 (18:42 +0100)]
FiguredBass: When checking for continuation in FigBass, also use alterations

14 years agoDoc: resolve FIXMEs.
Graham Percival [Sun, 21 Feb 2010 05:03:05 +0000 (05:03 +0000)]
Doc: resolve FIXMEs.

14 years agoDoc: CG: add "find emergencies" to major release list.
Graham Percival [Sun, 21 Feb 2010 04:59:30 +0000 (04:59 +0000)]
Doc: CG: add "find emergencies" to major release list.

14 years agoDoc: comment out broken keyboard navigation.
Graham Percival [Sun, 21 Feb 2010 04:58:49 +0000 (04:58 +0000)]
Doc: comment out broken keyboard navigation.

14 years agoDocs: Usage: update description of -dpreview.
Patrick McCarty [Mon, 22 Feb 2010 03:25:31 +0000 (19:25 -0800)]
Docs: Usage: update description of -dpreview.

14 years agoUpdate docstring for -dpreview.
Patrick McCarty [Mon, 22 Feb 2010 03:16:22 +0000 (19:16 -0800)]
Update docstring for -dpreview.

Since the SVG backend now supports -dpreview, and does not generate EPS
or PNG output, make the docstring more generic.

14 years agoDoc: CG: source-code.itexi: `FIXME' --> `TODO'.
Mark Polesky [Sun, 21 Feb 2010 17:36:28 +0000 (09:36 -0800)]
Doc: CG: source-code.itexi: `FIXME' --> `TODO'.

14 years agoProtect SCM members in Instrument_name_engraver/Instrument_switch_engraver.
Neil Puttock [Sun, 21 Feb 2010 17:32:23 +0000 (17:32 +0000)]
Protect SCM members in Instrument_name_engraver/Instrument_switch_engraver.

14 years agoFix #1009 (\transpose error with pitch alteration > double).
Neil Puttock [Sun, 21 Feb 2010 17:10:22 +0000 (17:10 +0000)]
Fix #1009 (\transpose error with pitch alteration > double).

* lily/music.cc (transpose_mutable):

  if delta pitch has an alteration larger than a double, normalize using
  Pitch::normalized (), preventing invalid alterations being converted to strings

  also normalize transposed pitch (this changes note name, but ensures valid
  pitch)

* lily/pitch.cc (normalized):

  new method

14 years agoDocs: Usage: fix links to alternate editors.
Patrick McCarty [Sun, 21 Feb 2010 09:35:04 +0000 (01:35 -0800)]
Docs: Usage: fix links to alternate editors.

14 years agoDoc: CG: `texinfo usage' nitpicks.
Mark Polesky [Sun, 21 Feb 2010 06:50:14 +0000 (22:50 -0800)]
Doc: CG: `texinfo usage' nitpicks.

14 years agoDoc: CG: explain line-length limits for @example blocks.
Mark Polesky [Sun, 21 Feb 2010 03:14:25 +0000 (19:14 -0800)]
Doc: CG: explain line-length limits for @example blocks.

14 years agoDoc: CG: Improve instructions for using SSH.
Mark Polesky [Sun, 21 Feb 2010 07:13:04 +0000 (23:13 -0800)]
Doc: CG: Improve instructions for using SSH.

14 years agoFix compile.
Mark Polesky [Sun, 21 Feb 2010 06:00:44 +0000 (22:00 -0800)]
Fix compile.

14 years agoTextedit URIs: leave the colon character unescaped.
Patrick McCarty [Sat, 20 Feb 2010 23:08:59 +0000 (15:08 -0800)]
Textedit URIs: leave the colon character unescaped.

The colon ":" is safe to leave unescaped in file URIs because

 - Windows needs it unescaped in the "C:\" path prefix
 - it is a forbidden character in filenames on Mac OS X
 - it is generally not used in filenames on GNU/Linux

14 years agoDoc: CG: Remove TODO from Engraver tutorial; line length
Carl Sorensen [Sat, 20 Feb 2010 16:11:35 +0000 (09:11 -0700)]
Doc: CG: Remove TODO from Engraver tutorial; line length

14 years agoDoc:CG: Add information on graphviz
Carl Sorensen [Sat, 20 Feb 2010 15:43:23 +0000 (08:43 -0700)]
Doc:CG:  Add information on graphviz

14 years agoDOC: NR 2.4.1 clarify use of rightHandFinger
Colin Campbell [Fri, 19 Feb 2010 23:12:01 +0000 (16:12 -0700)]
DOC: NR 2.4.1 clarify use of rightHandFinger

Emphasise the need for a hyphen before a call to \rightHandFinger

14 years agoWeb: add @bugfixes macro.
Mark Polesky [Thu, 18 Feb 2010 19:53:58 +0000 (11:53 -0800)]
Web: add @bugfixes macro.

This also fixes several broken/incorrect links.

14 years agoScript: now works with python 2.4, thanks Peter!
Graham Percival [Fri, 19 Feb 2010 07:52:38 +0000 (07:52 +0000)]
Script: now works with python 2.4, thanks Peter!

14 years agoDoc: CG: add warning about regtests not noticing ghostscript.
Graham Percival [Fri, 19 Feb 2010 04:51:12 +0000 (04:51 +0000)]
Doc: CG: add warning about regtests not noticing ghostscript.

14 years agoDoc: CG: Mention mailing list size limit.
Mark Polesky [Thu, 18 Feb 2010 20:15:53 +0000 (12:15 -0800)]
Doc: CG: Mention mailing list size limit.

14 years agoDoc: add instructions for articulate.ly; thanks Peter!
Graham Percival [Thu, 18 Feb 2010 16:04:39 +0000 (16:04 +0000)]
Doc: add instructions for articulate.ly; thanks Peter!

14 years agoLSR: Update.
Neil Puttock [Wed, 17 Feb 2010 23:10:58 +0000 (23:10 +0000)]
LSR: Update.

14 years agoThinko: Remove originalMiddleCPosition from Ottava_engraver.
Neil Puttock [Wed, 17 Feb 2010 22:39:07 +0000 (22:39 +0000)]
Thinko: Remove originalMiddleCPosition from Ottava_engraver.

* also add middleCOffset to read properties

14 years agoRename Time_scaled_music_iterator -> Tuplet_iterator.
Neil Puttock [Wed, 17 Feb 2010 22:30:47 +0000 (22:30 +0000)]
Rename Time_scaled_music_iterator -> Tuplet_iterator.

14 years agoRemove obsolete context property.
Neil Puttock [Wed, 17 Feb 2010 22:12:33 +0000 (22:12 +0000)]
Remove obsolete context property.

* scm/define-context-properties.scm (all-internal-translation-properties):

  remove originalMiddleCPosition.

14 years agoconvert-ly: Raise an error message if version number is not a three-entry tuple
Reinhold Kainhofer [Thu, 31 Dec 2009 11:20:41 +0000 (12:20 +0100)]
convert-ly: Raise an error message if version number is not a three-entry tuple

This fixes crashes with things like
   \version "2.10"
or
   \version "2.10.4.3.21"
and instead gracefully reminds the user that version strings should have a
form like `2.8.12'

14 years agoDoc:Extending -- Add example of grob-interpret-markup
Carl Sorensen [Wed, 17 Feb 2010 21:21:57 +0000 (14:21 -0700)]
Doc:Extending -- Add example of grob-interpret-markup

14 years agoWeb build: better way of building translations.
Graham Percival [Wed, 17 Feb 2010 18:41:46 +0000 (18:41 +0000)]
Web build: better way of building translations.

By "better", I mean "being beaten up by bikini-clad girls with
rubber pipes is **better** than being beaten up by bikini-clad
football players".  No offense to anybody who desires such things
(citing rule 34).

Yes, the for loop is ugly, especially since I don't know why the
various escape strings work.  And I'm positive that this is a
stupid way of writing a makefile; patches from anybody who knows
anything about makefiles are appreciated.

14 years agoFix doubled words; whitespace.
Mark Polesky [Wed, 17 Feb 2010 16:55:07 +0000 (08:55 -0800)]
Fix doubled words; whitespace.

14 years agoDoc: Fix doubled words.
Mark Polesky [Wed, 17 Feb 2010 07:16:03 +0000 (23:16 -0800)]
Doc: Fix doubled words.

14 years agoDoc: CG: add lily-git instructions.
Mark Polesky [Wed, 17 Feb 2010 06:42:47 +0000 (22:42 -0800)]
Doc: CG: add lily-git instructions.

14 years agoNew markup command `parenthesize' in `scm/define-markup-commands.scm'. This works...
Thomas Morgan [Mon, 6 Jul 2009 14:08:06 +0000 (16:08 +0200)]
New markup command `parenthesize' in `scm/define-markup-commands.scm'. This works like the `bracket' markup command but makes parentheses instead of brackets.

New public procedure `parenthesize-stencil' and subroutine
`make-parenthesis-stencil' in `scm/stencil.scm'.

Thanks to Carl Sorensen and Neil Puttock for their great advice and
criticism.

14 years agotablature: corrected string tuning for DADGAD
Marc Hohl [Mon, 15 Feb 2010 15:39:02 +0000 (16:39 +0100)]
tablature: corrected string tuning for DADGAD

14 years agoWeb build: start building translations.
Graham Percival [Mon, 15 Feb 2010 01:23:52 +0000 (01:23 +0000)]
Web build: start building translations.

14 years agoFix lilypond-book <lilypond> option handling.
Christian Hitz [Sun, 14 Feb 2010 14:07:00 +0000 (15:07 +0100)]
Fix lilypond-book <lilypond> option handling.

* require a space before any options
* require the presence of the colon

Fixes <lilypondversion/>, too.

14 years agoMore cleanly factor out the bass figure group object
Reinhold Kainhofer [Thu, 8 Oct 2009 11:16:08 +0000 (13:16 +0200)]
More cleanly factor out the bass figure group object

14 years agoFix compiler warnings.
Werner Lemberg [Sun, 14 Feb 2010 09:49:21 +0000 (10:49 +0100)]
Fix compiler warnings.

14 years agoSVG backend: fix thinko in dump-preview routine.
Patrick McCarty [Sun, 14 Feb 2010 05:30:18 +0000 (21:30 -0800)]
SVG backend: fix thinko in dump-preview routine.

The testcases I was working with did not have stencil extents sticking
above the X-axis, so I forgot about flipping the Y value here.

14 years agoDoc: essay work on benchmarking
Andrew Hawryluk [Fri, 4 Dec 2009 21:25:01 +0000 (14:25 -0700)]
Doc: essay work on benchmarking

Added new Finale example, improved annotations on the LP 1.4 example.
Also resized essay images for HTML output.

14 years agoFix issue 1011.
Christian Hitz [Sat, 13 Feb 2010 11:59:14 +0000 (12:59 +0100)]
Fix issue 1011.

Make lilypond-book handle spaces before the closing '>'
bracket as allowed by the HTML standard.

14 years agoRelease: bump version.
Graham Percival [Sat, 13 Feb 2010 19:37:14 +0000 (19:37 +0000)]
Release: bump version.

14 years agoDoc: CG: fix cut&paste instructions.
Graham Percival [Sat, 13 Feb 2010 18:34:01 +0000 (18:34 +0000)]
Doc: CG: fix cut&paste instructions.

I forgot that vi would capture keystrokes.  I've now split the
command-line stuff into two @examples.

14 years agoMerge commit 'origin' into release/unstable release/2.13.13-1
Graham Percival [Sat, 13 Feb 2010 18:09:29 +0000 (18:09 +0000)]
Merge commit 'origin' into release/unstable

14 years agoDoc: CG: update release cut&paste.
Graham Percival [Sat, 13 Feb 2010 17:55:27 +0000 (17:55 +0000)]
Doc: CG: update release cut&paste.

14 years agoBuild fix; file not distributed.
Graham Percival [Sat, 13 Feb 2010 17:53:54 +0000 (17:53 +0000)]
Build fix; file not distributed.

14 years agoRelease: update news.
Graham Percival [Sat, 13 Feb 2010 17:15:52 +0000 (17:15 +0000)]
Release: update news.

14 years agoMusicXML: Oops, fix href to MIT license
Reinhold Kainhofer [Fri, 12 Feb 2010 20:14:10 +0000 (21:14 +0100)]
MusicXML: Oops, fix href to MIT license

14 years agoMusicXML: Put the test suite under the MIT license, which is very permissive (documen...
Reinhold Kainhofer [Fri, 12 Feb 2010 19:05:02 +0000 (20:05 +0100)]
MusicXML: Put the test suite under the MIT license, which is very permissive (document this)

14 years agoMusicXML: Put the test suite under the MIT license, which is very permissive
Reinhold Kainhofer [Fri, 12 Feb 2010 19:03:13 +0000 (20:03 +0100)]
MusicXML: Put the test suite under the MIT license, which is very permissive

14 years agoDoc: remove FIXME.
Graham Percival [Thu, 11 Feb 2010 16:21:53 +0000 (16:21 +0000)]
Doc: remove FIXME.

Apparently the "public domain vs. FDL" was done by somebody else
(John?), without removing the FIXME.

14 years agoDoc: resolve more FIXMEs.
Graham Percival [Thu, 11 Feb 2010 16:03:43 +0000 (16:03 +0000)]
Doc: resolve more FIXMEs.

14 years agoDoc -- change FIXME to TODO in chord-names-jazz.ly
Carl Sorensen [Thu, 11 Feb 2010 15:58:55 +0000 (08:58 -0700)]
Doc -- change FIXME to TODO in chord-names-jazz.ly

14 years agoDoc: resolve various FIXMEs.
Graham Percival [Thu, 11 Feb 2010 00:48:23 +0000 (00:48 +0000)]
Doc: resolve various FIXMEs.

Downgrading a FIXME to a TODO is still a "resolution".  Of a sort.

14 years agoDoc: CG: add "no output, no good message" to priority-high.
Graham Percival [Thu, 11 Feb 2010 00:14:07 +0000 (00:14 +0000)]
Doc: CG: add "no output, no good message" to priority-high.

14 years agoDoc: reinstate percussion in Clef.
Graham Percival [Tue, 9 Feb 2010 13:41:26 +0000 (13:41 +0000)]
Doc: reinstate percussion in Clef.

14 years agoDoc: CG: clarify issue classifications.
Graham Percival [Tue, 9 Feb 2010 12:58:59 +0000 (12:58 +0000)]
Doc: CG: clarify issue classifications.

14 years agoSVG backend: add an output-preview-framework.
Patrick McCarty [Sun, 7 Feb 2010 10:27:58 +0000 (02:27 -0800)]
SVG backend: add an output-preview-framework.

With this commit, the SVG backend now supports -dpreview, and it
works identically to -dpreview with the EPS backend (the default
setting).

In other words, this command will work:

  $ lilypond -dbackend=svg -dpreview example.ly

Closes issue #968.

14 years agoPS backend: move system-filtering code to backend-library.
Patrick McCarty [Mon, 8 Feb 2010 23:01:36 +0000 (15:01 -0800)]
PS backend: move system-filtering code to backend-library.

The SVG backend will need this code, so the backend-library
is a better place for it.

14 years agoPS backend: remove unused code.
Patrick McCarty [Mon, 8 Feb 2010 22:37:58 +0000 (14:37 -0800)]
PS backend: remove unused code.

14 years agoDocs: Contributor: nitpick
Trevor Daniels [Mon, 8 Feb 2010 13:10:55 +0000 (13:10 +0000)]
Docs: Contributor: nitpick

14 years agoDocs: Contributor: Improve issues a bit more
Trevor Daniels [Mon, 8 Feb 2010 10:57:39 +0000 (10:57 +0000)]
Docs: Contributor: Improve issues a bit more

14 years agoDoc: Explain tricky updating of Snippets translations.
Francisco Vila [Mon, 8 Feb 2010 01:13:40 +0000 (02:13 +0100)]
Doc: Explain tricky updating of Snippets translations.

14 years agoDoc: CG: improve Issues.
Graham Percival [Mon, 8 Feb 2010 00:43:39 +0000 (00:43 +0000)]
Doc: CG: improve Issues.

14 years agoWeb: fix version in release announcement.
Graham Percival [Mon, 8 Feb 2010 00:43:23 +0000 (00:43 +0000)]
Web: fix version in release announcement.

14 years agoDoc build: fix lc_last.
Graham Percival [Mon, 8 Feb 2010 00:34:46 +0000 (00:34 +0000)]
Doc build: fix lc_last.

I have NO CLUE how I managed to ignore the fact that I was
checking a non-existant variable.. nor how I managed to "check"
that my "fix" "worked" with completely broken code.

I also have NO CLUE why perl didn't barf when I started checking
the state of a non-existant variable, but I'm sadly not surprised
about it's permissiveness.

14 years agoDoc: tweaks to previous Web commit.
Graham Percival [Mon, 8 Feb 2010 00:19:21 +0000 (00:19 +0000)]
Doc: tweaks to previous Web commit.

14 years agoWEB: minor updates in wording
Colin Campbell [Sun, 7 Feb 2010 03:13:25 +0000 (20:13 -0700)]
WEB: minor updates in wording

Reworded sections of Introduction, Text Input and Easier Editing.
Updated description of Denemo, added LilyComp.

14 years agoDoc: various fixes for the previous commit.
Graham Percival [Sun, 7 Feb 2010 22:37:43 +0000 (22:37 +0000)]
Doc: various fixes for the previous commit.

No, I don't want to talk about it.

14 years agoDoc: fundamental.itely examples tidy up
james [Sun, 7 Feb 2010 15:15:39 +0000 (15:15 +0000)]
Doc: fundamental.itely examples tidy up

Tidy up layout for examples as per CG for Learning Manuals
Various spacing issues (brases, slurs and indents mainly)
Remove unnecessary end of line bar checks
put variables on new lines to add to clarity for new users

14 years agoMerge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond
John Mandereau [Sun, 7 Feb 2010 02:04:15 +0000 (03:04 +0100)]
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond

14 years agoDocs: add pointer to warnings re \removeEmptyStaffContext
Trevor Daniels [Sat, 6 Feb 2010 23:55:22 +0000 (23:55 +0000)]
Docs: add pointer to warnings re \removeEmptyStaffContext

14 years agoMerge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond
John Mandereau [Sat, 6 Feb 2010 21:37:27 +0000 (22:37 +0100)]
Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

14 years agoDoc: Improve clef documentation in NR
Patrick Schmidt [Mon, 1 Feb 2010 17:10:11 +0000 (18:10 +0100)]
Doc: Improve clef documentation in NR

added index entries. added example for moderntab clef. moved tab clef to Default tablatures, moderntab clef to Custom tablatures and percussion clef to Basic percussion notation.

14 years agoDoc: clarify GOP blurb on website+CG.
Graham Percival [Sat, 6 Feb 2010 20:37:39 +0000 (20:37 +0000)]
Doc: clarify GOP blurb on website+CG.

14 years agoDoc-es: set committishes of translated Texidoc strings.
Francisco Vila [Sat, 6 Feb 2010 18:43:34 +0000 (19:43 +0100)]
Doc-es: set committishes of translated Texidoc strings.

14 years agoDoc-es: more updates of snippets.
Francisco Vila [Sat, 6 Feb 2010 18:30:40 +0000 (19:30 +0100)]
Doc-es: more updates of snippets.

14 years agoAllow breathing signs to end automatic beams.
Neil Puttock [Sat, 6 Feb 2010 18:08:19 +0000 (18:08 +0000)]
Allow breathing signs to end automatic beams.

14 years agoDoc-es: typo
Jean-Charles Malahieude [Sat, 6 Feb 2010 17:20:06 +0000 (18:20 +0100)]
Doc-es: typo

one extra } in combining-two-parts-on-the-same-staff.texidoc

14 years agoDoc: LM - Common.notation.itely examples tidy
James Lowe [Fri, 5 Feb 2010 21:00:24 +0000 (21:00 +0000)]
Doc: LM - Common.notation.itely examples tidy

tidy up layout for examples as CG for Learning Manual
minor spacing issues for slurs/ties and braces.

14 years agoDoc: LM - Tutorial.itely examples tidy up
James Lowe [Fri, 5 Feb 2010 20:35:53 +0000 (20:35 +0000)]
Doc: LM - Tutorial.itely examples tidy up

tidy up layout for examples as per CG for Learning Manual
this doc had only one spacing issue

14 years agoDoc-es: update of Learning/Fundamental.
Francisco Vila [Fri, 5 Feb 2010 19:37:40 +0000 (20:37 +0100)]
Doc-es: update of Learning/Fundamental.

14 years agoWeb build: fix color generation.
Graham Percival [Fri, 5 Feb 2010 18:59:18 +0000 (18:59 +0000)]
Web build: fix color generation.

I have **no clue** why lc_last() screws up the colors in this one
case, but the workaround appears to work, so yay.

14 years agoDoc build: only lower-case last portion of hrefs.
Graham Percival [Fri, 5 Feb 2010 12:12:36 +0000 (12:12 +0000)]
Doc build: only lower-case last portion of hrefs.

14 years agoDoc -- clarify instrumentName change example
Carl Sorensen [Thu, 4 Feb 2010 23:54:42 +0000 (16:54 -0700)]
Doc -- clarify instrumentName change example

14 years agoDoc: CG Store answer from Joe about spacing algorithm
Carl Sorensen [Thu, 4 Feb 2010 23:51:41 +0000 (16:51 -0700)]
Doc: CG Store answer from Joe about spacing algorithm

14 years agoConvert \bar "||:" -> \bar ".|" if not called at line break.
Neil Puttock [Thu, 4 Feb 2010 22:58:59 +0000 (22:58 +0000)]
Convert \bar "||:" -> \bar ".|" if not called at line break.

14 years agoDocs: Authors: Add font-related contributors.
Neil Puttock [Thu, 4 Feb 2010 22:32:49 +0000 (22:32 +0000)]
Docs: Authors: Add font-related contributors.

14 years agoUpdate mailmap.
Patrick McCarty [Thu, 4 Feb 2010 20:31:15 +0000 (12:31 -0800)]
Update mailmap.

14 years agoDoc-es: remove last snippets from the lsr directory.
Francisco Vila [Thu, 4 Feb 2010 18:37:18 +0000 (19:37 +0100)]
Doc-es: remove last snippets from the lsr directory.

14 years agoBuild: version.
Graham Percival [Thu, 4 Feb 2010 18:04:10 +0000 (18:04 +0000)]
Build: version.

14 years agoMerge commit 'origin' into release/unstable release/2.13.12-1
Graham Percival [Thu, 4 Feb 2010 15:38:50 +0000 (15:38 +0000)]
Merge commit 'origin' into release/unstable

14 years agoBuild fix: more problems with translations.
Graham Percival [Thu, 4 Feb 2010 15:37:53 +0000 (15:37 +0000)]
Build fix: more problems with translations.

14 years agoDoc: Notation-Appendices.itely MIDI List
james [Wed, 3 Feb 2010 17:29:10 +0000 (17:29 +0000)]
Doc: Notation-Appendices.itely MIDI List

Clarified what the ordering is (e.g. why it isn't alphabetical).

14 years agobib2html: set TEXMFOUTPUT to the tempdir.
Patrick McCarty [Tue, 2 Feb 2010 21:33:44 +0000 (13:33 -0800)]
bib2html: set TEXMFOUTPUT to the tempdir.

With the latest update of TeX Live 2009, bibtex became a "safe" command
in that it cannot write output to any directory other than

  (a) a subdirectory of the current directory
  (b) a subdirectory of TEXMFOUTPUT

Setting TEXMFOUTPUT to the temporary directory permits bibtex to write
in that directory.

Additionally, use mkstemp() instead mktemp(), since the latter function
has been deprecated since Python 2.3.

14 years agoDoc: CG: easier cut&paste for release work.
Graham Percival [Thu, 4 Feb 2010 15:24:33 +0000 (15:24 +0000)]
Doc: CG: easier cut&paste for release work.

14 years agoMerge commit 'origin' into release/unstable
Graham Percival [Thu, 4 Feb 2010 15:15:24 +0000 (15:15 +0000)]
Merge commit 'origin' into release/unstable